Camilla Berglund 9a183090e0 Merge branch 'master' into showwindow ... Conflicts: src/window.c		2012-09-06 15:11:50 +02:00
..
GL	Merge branch 'master' into showwindow	2012-09-06 15:11:50 +02:00