]> git.mxchange.org Git - friendica.git/commit
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sat, 17 Mar 2012 00:49:17 +0000 (01:49 +0100)
committerzottel <github@zottel.net>
Sat, 17 Mar 2012 00:49:17 +0000 (01:49 +0100)
commitc56e3c5dd4bcbb949282fd3b4c065ccfd4673726
treec4574eae6f2aaf68c50ccc1022944e0e1c45760b
parentea4c806c5c3adacb6ef585de657e5f34c2e24c98
parent8af36b92bb3a78235f5741c764d034dc66b959b2
Merge remote branch 'upstream/master'