Igor Wiedler 2c68dc2e6d Merge remote-tracking branch 'sadu/ticket/10438' into develop ...

* sadu/ticket/10438:
  [ticket/10438] Alligning the Smileys on the same line as the text.

2012-04-01 21:39:37 +02:00

..

prosilver

Merge remote-tracking branch 'sadu/ticket/10438' into develop

2012-04-01 21:39:37 +02:00

subsilver2

Merge pull request #670 from imkingdavid/feature/qrpreview

2012-04-01 11:28:47 -07:00