From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Mon, 24 Sep 2012 09:37:17 +0000 (+0200)
Subject: Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=0b4fd82c4380dfdbd8e4bd37e1b4aa9907a1b187

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

0b4fd82c4380dfdbd8e4bd37e1b4aa9907a1b187