tree 03aec1a0863564d797a53c4c226d0311be59e4b5
parent 2fdbe86df8dc470f9bb90d3cc84bbb9d2fcfa7a3
parent 3331cfa76d6604d03e8df4069b96aca4cce62907
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406594634 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1406594773 -0700

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

Change-Id: I5c62c7de04027d40f083c871d6d5b6f42a6f8965