]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Thu, 12 Apr 2012 22:10:41 +0000 (00:10 +0200)
committerMichael Vogel <icarus@dabo.de>
Thu, 12 Apr 2012 22:10:41 +0000 (00:10 +0200)
commit572678fef95816deaa1ecafe5cbcfb8cc65963c9
treee59df4f38865c14111d5460e85192759380786a8
parent138caa4380c442200964c8cf071438a0be89da70
parente3af552bbfff2632bbcf2ce94c3e08ad4a5142d2
Merge commit 'upstream/master'

Conflicts:

include/dba.php
include/dba.php