]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 22:56:38 +0000 (17:56 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 5 Mar 2012 22:56:38 +0000 (17:56 -0500)
commit6a0729d5a4e7e445feb3a7fddfb00d5803047e87
tree60e14a8b682b89025800460f7a140f06f45dd29f
parent0d9c2ca06f9394bc039a43410d3902338e8412a1
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  revup

* master: