Merge remote-tracking branch 'upstream/develop' into develop
authorgstraube <georg.straube@googlemail.com>
Fri, 21 Aug 2015 18:45:40 +0000 (20:45 +0200)
committergstraube <georg.straube@googlemail.com>
Fri, 21 Aug 2015 18:45:40 +0000 (20:45 +0200)
commit1a8a6557474d510bf0b49bc7f7d94bb4c96755a2
treeef83ff248f2a5dba97115aa20bb33883be13f2df
parentaec910ff838026ebcca673f3e7e3dc3161a249a2
parent0c7a9c3e3a0bba9344db08c8c2acf2718b968e92
Merge remote-tracking branch 'upstream/develop' into develop