]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 12 May 2012 19:55:03 +0000 (15:55 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 12 May 2012 19:55:03 +0000 (15:55 -0400)
commit89df33f0a8f03116a31351fbaa0aed23767bc3ef
tree441b5c0074bc24e037b8bae0e394f518793a75b0
parent9699d9cd019cb668afdf0e0c9c390d331fcc6240
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  diabook-theme: fix in earthlayers
  diabook-theme: some fixes

* master: