tree d2385d5b28a4346e8dc4d65d059f21450db7d46b
parent 8e2104a7cbdb65ae3ea6d6885d821f5d9a2dbb1c
parent c3fd51e69b9a19b4f8adb2ba827689a32dc7d16b
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1358882472 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> 1358882472 -0800

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

Conflicts:
	src/sync-core.cc
	src/sync-core.h