Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12675] Fix code sniffer complaints introduced by recent commits
This commit is contained in:
Andreas Fischer 2014-06-09 02:38:35 +02:00
commit 31abf1ab02
2 changed files with 2 additions and 2 deletions