Merge remote-tracking branch 'AGSPhoenix/teamcoco-fix'
authorPhilipp Hagemeister <phihag@phihag.de>
Fri, 4 Apr 2014 20:44:49 +0000 (22:44 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Fri, 4 Apr 2014 20:44:49 +0000 (22:44 +0200)

Trivial merge