From: Philip Chimento <philip.chimento@gmail.com>
Date: Sat, 25 Aug 2012 21:01:23 +0000 (+0200)
Subject: Merge branch 'master' into gtk3
X-Git-Tag: v0.9~20
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=81becb22fdc69e406c685c65b9f55fd514df142b

Merge branch 'master' into gtk3
---

81becb22fdc69e406c685c65b9f55fd514df142b