Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sun, 22 Apr 2012 05:17:13 +0000 (01:17 -0400)
* remotes/upstream/master:
  rev update
  diabook-themes: deleted obsolete diabook-folder & minor bug-fixes

* master:


Trivial merge