Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3
authorMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 16:14:12 +0000 (18:14 +0200)
committerMarijn van Vliet <w.m.vanvliet@gmail.com>
Sat, 15 Sep 2012 16:14:12 +0000 (18:14 +0200)
commit114f807911409ba7f4f83147f5d7f65fb1b72b5f
tree523439ff6bf47aef4d0aa0d09c3ce3c94655b5a4
parent2b44d8d468ed734afd0bed5b3577c871782eb00d
parent044af5b603b590e5cbc9e916786d6c3fb835b38e
Merge branch 'gtk3' of ssh://git.stderr.nl/projects/chimara/chimara into gtk3