From: Simon L'nu <simon.lnu@gmail.com>
Date: Fri, 9 Mar 2012 01:38:54 +0000 (-0500)
Subject: Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8d19baadffaf38a563a3ad1052180bcb142eb564;p=friendica.git

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

* remotes/upstream/master:
  theme info file for testbubble
  catalan translation
  revup
  add theme diabook-blue, fix css

* master:
---

8d19baadffaf38a563a3ad1052180bcb142eb564