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

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

114f807911409ba7f4f83147f5d7f65fb1b72b5f