Merge branch 'master' into releases 3.1.0
authorHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:47:19 +0000 (10:47 +0200)
committerHolger Schemel <info@artsoft.org>
Sat, 30 Aug 2014 08:47:19 +0000 (10:47 +0200)
commit24fbe612bfb4e4a49c79f7cbade55c3c258441d8
treeef2db78cdf46b6a4f3f166d369e5f1f7e20b6513
parent1ae6433828b1881d7810082472c72dfb3372a061
parent201eaae5ae325e0c99e43ab240163a99dc5c0db9
Merge branch 'master' into releases