tree 2b29a1ba74041838e14e7eac67a209fbfbcd6d61
parent db4affc05e941e5f033b16b6e60b96f74d131ed8
parent 49bb1fb50848284abb3a5c1491d301ef173d6e74
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406594261 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406594353 -0700

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

Change-Id: I086a5cce154fa6db26bb05d8f1e45715636c9656