]> git.mxchange.org Git - friendica-addons.git/commitdiff
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 20:57:22 +0000 (16:57 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 2 Apr 2012 20:57:22 +0000 (16:57 -0400)
* remotes/upstream/master:
  update packages
  make pageheader work on all themes

* master:


Trivial merge