]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Thu, 12 Apr 2012 05:03:54 +0000 (01:03 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Thu, 12 Apr 2012 05:03:54 +0000 (01:03 -0400)
commita3b2f35c84c2f31a31e5730a68f9fe6a9c01dd73
tree3f5c860299deb4fa82ed22d5e957de5864be9943
parenta1d5026abf129fc520327881a293d17c1ab21eff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-themes: small fix

* master: