]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Mon, 3 Dec 2012 07:30:49 +0000 (08:30 +0100)
committerMichael Vogel <icarus@dabo.de>
Mon, 3 Dec 2012 07:30:49 +0000 (08:30 +0100)
commit5635fe250ca4ef8e1dcf12cfe0f49b2a23c86b16
treefa1356a9af4224defe122c6e31003e9bbcb9842b
parentd548d1943f09a01d5b553d4d66404728d85b5b50
parentfa90f27b53e8c255d048797f31bbce789e7e8d22
Merge remote-tracking branch 'upstream/master'