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

Merge branch 'master' into gtk3
---

dc9213af8972055ee54bdee4cced6103e1432010