]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 22:52:12 +0000 (17:52 -0500)
committerSimon L'nu <simon.lnu@gmail.com>
Tue, 6 Mar 2012 22:52:12 +0000 (17:52 -0500)
commit0badf3110f321ddafdc3d958e5da13626da6f60a
tree8f07addc4291d01d99d06431f0ec8f51651e4fa1
parent8fb0ea4048745c09ece6c84f23bffdccfc59d67d
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  bugs #312, #313
  revup

* master: