]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Sat, 21 Apr 2012 08:34:56 +0000 (04:34 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Sat, 21 Apr 2012 08:34:56 +0000 (04:34 -0400)
commit2d129e7455b6b083809a03df97f299db732d79f6
tree5c11d463eff15245458f5033d7d425671df8f1d0
parentbdbe068b95e8c302179530dff7583997ff35f246
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master: