Merge branch 'gui_devel'
authorMichael Wiebusch <stratomaster@gmx.net>
Mon, 5 Aug 2013 09:01:33 +0000 (11:01 +0200)
committerMichael Wiebusch <stratomaster@gmx.net>
Mon, 5 Aug 2013 09:01:33 +0000 (11:01 +0200)
commit00e8c9127fadf3366d5ee64ea17c8b11f974f53d
tree0b0b6c100c15dadf3d919c05d8cf7c823f795aa2
parent0623d38501347cc7405a98e1231a4ca8df5f50e8
parent1078a10892a7880a348ad7a5334c154740764049
Merge branch 'gui_devel'