Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  slight improvement in handling of plaintext feeds
  css-fixes
  add new messages-layout in diabook
  fix the display of community-plugin in diabook-themes
  that didn't quite work out
  document tinymce fixes/workarounds
  various bugfixes and css-fixes
  qcomment overflow
  try slightly better detection of html in feeds
  send unverified private mail using zrl

* master:
This commit is contained in:
Simon L'nu 2012-04-01 18:59:53 -04:00
parent 2589feef70
commit 9472ba8d20

Diff Content Not Available