Merge branch 'vendor/EE'
authorSascha Wildner <saw@online.de>
Sun, 9 Feb 2014 05:09:01 +0000 (06:09 +0100)
committerSascha Wildner <saw@online.de>
Sun, 9 Feb 2014 05:09:01 +0000 (06:09 +0100)

Trivial merge