From: Rhonda D'Vine Date: Fri, 14 Aug 2015 09:23:36 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/upstream' X-Git-Tag: debian/0.6.1-1~22 X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=commitdiff_plain;h=9d44ff8525e1459e9fa17410a2e275b2ca24293a Merge remote-tracking branch 'origin/upstream' --- 9d44ff8525e1459e9fa17410a2e275b2ca24293a