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

Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
---

bb6ef9669d8f9ba58c52e1cadae9b7b303d5bc70