Merge branch 'master' of ssh://bucardo.org/var/lib/git/bucardo into database-specific...
authorJoshua Tolley <josh@endpoint.com>
Mon, 22 Apr 2013 22:11:59 +0000 (16:11 -0600)
committerJoshua Tolley <josh@endpoint.com>
Mon, 22 Apr 2013 22:11:59 +0000 (16:11 -0600)
1  2 
bucardo

diff --cc bucardo
Simple merge