Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12544] Update Plupload to 2.1.2.
This commit is contained in:
Andreas Fischer 2014-05-14 23:04:26 +02:00
commit 84f8f18b1c

File diff suppressed because one or more lines are too long