Merge branch 'misc-patches' into devel
commit67b1edc3c5554f4f465329ada79684a790f09c8b
authorJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:45 +0000 (10 10:11 +0100)
committerJohannes Sixt <j6t@kdbg.org>
Tue, 10 Nov 2015 09:11:45 +0000 (10 10:11 +0100)
treece5ca90557df22d5574f2c53d141abc42c73bfb2
parentf0a37471c54bc853b1a3a83ebd3aa957d36b45e8
parent81c5fbe8b1ddbee01f83f1cd290c47ac0038be36
Merge branch 'misc-patches' into devel