Merge branch 'master' of bucardo.org:/var/lib/git/bucardo
authorGreg Sabino Mullane <greg@endpoint.com>
Wed, 3 Feb 2016 20:07:07 +0000 (15:07 -0500)
committerGreg Sabino Mullane <greg@endpoint.com>
Wed, 3 Feb 2016 20:07:07 +0000 (15:07 -0500)
1  2 
bucardo

diff --cc bucardo
Simple merge