Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 16 Aug 2014 18:09:17 +0000 (20:09 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 16 Aug 2014 18:09:17 +0000 (20:09 +0200)
commite9c160c8eaccb89a39f2a7fe85394ce43f1f1823
treeb7758763a3450c5d3aa9a0f526d2632970cd62cc
parent899e2351d1cf516c8cd818dddc89c2bda38d6d26
parent5df2b07cfb19a2a53be992b0e69a4cd4390881c7
Merge branch '2.0'

Conflicts:
wcfsetup/install/files/js/WCF.Message.js