Merge branch 'develop' into fixForCrashedSharedContents
authorzerginator <thorstenvomsee@gmx.de>
Sun, 28 Apr 2013 09:40:40 +0000 (11:40 +0200)
committerzerginator <thorstenvomsee@gmx.de>
Sun, 28 Apr 2013 09:40:40 +0000 (11:40 +0200)

Trivial merge