Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12933] Handle case when * is last character of word
This commit is contained in:
Andreas Fischer 2015-01-29 00:03:31 +01:00
commit ef10b02f78

Diff content is not available