tree 0cead36b981b4fbdae0322e9b669a1f3d539e1f1
parent 98b595c4b001f5170453e0d6d10f92142128162b
parent 96978b421cf2b73395ce71dfe1bdc2806d9c31bc
author Wentao Shang <wentaoshang@gmail.com> 1356891441 -0800
committer Wentao Shang <wentaoshang@gmail.com> 1356891441 -0800

Merge branch 'master' into sigverify

Conflicts:
	js/tools/build/ndn-js.js