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

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

d9646c0bf915d1ee5d9d3601a273ff20214bfae7