Merge branch 'nextRelease-3.2' into nextRelease
commit3d469cc1a0e96837d37787e0a41376c962ef7896
authorHenrik Rusche <h.rusche@wikki-gmbh.de>
Mon, 16 Jun 2014 14:50:20 +0000 (16 16:50 +0200)
committerHenrik Rusche <h.rusche@wikki-gmbh.de>
Mon, 16 Jun 2014 14:50:20 +0000 (16 16:50 +0200)
tree8ccb0f8dd758fbd94884da396dffbf9971ffc1bf
parent3389731ba8fa06dbe823fd6dede4ead8ee73c853
parent10725e96206adb6f734cbe9ade73dbec397edc15
Merge branch 'nextRelease-3.2' into nextRelease

Conflicts:
ListOfContributors
ListOfContributors