Merge branch 'sync-fixes' into staging
authorCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 12:20:51 +0000 (13:20 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 21 May 2013 12:20:51 +0000 (13:20 +0100)
1  2 
src/lib/matcher.h

Simple merge