]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Mon, 14 May 2012 04:26:34 +0000 (00:26 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Mon, 14 May 2012 04:26:34 +0000 (00:26 -0400)
commitfcf6d10efd72f523879b8354e065ad4297e5434f
tree4473746d689f3039f45bd2c09ea97115bf78db53
parent39c042f4ea33abd77d6431c531b6eae72f2d7994
parentc12ec1116b54f0f39697099a583bb82150a8b703
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  rev update

* master: