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

* remotes/upstream/master:
  update to the German string files
  diabook-themes: removed fpostit due to security issues and small fix in german translation
  naked br appearing when attaching and textplain
  Some Bugfixes, and variable checks
  rev update

* master:
This commit is contained in:
Simon L'nu 2012-04-17 13:17:13 -04:00
parent 04af5d9e2c
commit d92bab6693

Diff Content Not Available