tree eade6693a552cd2ffd0c6e748ef88238265b83a6
parent 7599db43617ccdf7c5406027ac614e625bb72a8c
parent d9826669a4a50f60070abe2c876f2765d98fffd0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1359400852 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1359400852 -0800

Merge remote-tracking branch 'git.irl/alex'

Conflicts:
	ccnx/ccnx-wrapper.cpp