Andreas Fischer da958ccb4f Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11094] Add textbox for jabber while memberlist search

2013-06-20 01:21:34 +02:00

..

prosilver

Merge branch 'develop-olympus' into develop

2013-06-20 01:21:34 +02:00

subsilver2

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00