tree 6369067b13fc3e6c39d985a502c1247ba4de45fa
parent 193d805ee975b3c8fdbda23616127e3c7bfb28dd
parent 28eb909f511777c9dca06cab42da9fc11d3afbf0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1435769801 -0700
committer Gerrit Code Review <gerrit@named-data.net> 1435769801 -0700

Merge "Fix compilation failure because of changes in ndn-cxx library"