]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 23 May 2012 22:04:23 +0000 (18:04 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 23 May 2012 22:04:23 +0000 (18:04 -0400)
commitfb50727f8d15da3f1ae67b5c2594d3c31b560842
tree14ce8be3e103fc0574f717a6ab679c9a449a7a02
parentda672694680df9cd9447da4c65b9492150d41c23
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:

* master: