]> git.mxchange.org Git - friendica.git/commit
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Fri, 30 Mar 2012 00:16:49 +0000 (20:16 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Fri, 30 Mar 2012 00:16:49 +0000 (20:16 -0400)
commitfe1e384a51e753baf2d80aaf35af7d0a3b4dfbeb
tree328215df9dbfe0b0fe8468331d5c0cf4eb0c7d21
parente7b920c273efd8c6a70b90f701bd14f5c632d38f
parent5921dc6f1679afdcc0551da248f94d24db9ed360
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  typo in function name

* master: