Merge remote-tracking branch 'marcrbouvier/master'

This commit is contained in:
Marc Zinnschlag 2013-09-06 08:44:59 +02:00
commit 3d66f7521e