From: Marijn van Vliet <w.m.vanvliet@gmail.com>
Date: Sat, 15 Sep 2012 16:13:59 +0000 (+0200)
Subject: Merge branch 'master' into gtk3
X-Git-Tag: v0.9~14
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=2b44d8d468ed734afd0bed5b3577c871782eb00d

Merge branch 'master' into gtk3
---

2b44d8d468ed734afd0bed5b3577c871782eb00d