tree 773ba2ce5169eff9e5c246f7b9fa5351054c58b3
parent 410c83e1d4718533779ea4b3b1d118c4e4bbff2e
parent cb2d0dd7f8490f9ac5f695964572939bf228d2b0
author Zhenkai Zhu <zhenkai@cs.ucla.edu> 1357251335 -0800
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> 1357251335 -0800

Merge branch 'dev'

Conflicts:
	include/ccnx-wrapper.h