Merge branch 'master' into codemirror
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 2 Jun 2013 19:12:52 +0000 (21:12 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 2 Jun 2013 19:13:35 +0000 (21:13 +0200)
commit8d71676198e192253fab0b4dac72bccf96584cb1
tree6a64ba2a7cba2d121a28a2b7413ddf1f0b1e4a3b
parent77b7b761a03c861aa5fb80483fdc378cd13f5eda
parent7283468fdc28732d89c273b2d46f7a0a3c469d05
Merge branch 'master' into codemirror

Conflicts:
wcfsetup/install/files/acp/templates/styleAdd.tpl
wcfsetup/install/files/acp/templates/styleAdd.tpl