tree 6387d6f47cb6309fd74b1b147d909863b828b2a1
parent 263c3c38ca34025761b2c9fef77c79bd34460227
parent 54ce66887f1348281e0ffa7511328666276fccf9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406650198 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406650198 -0700

Merge remote-tracking branch 'named-data/master' into release-0.2.0