]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 15 Apr 2012 14:49:54 +0000 (16:49 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 15 Apr 2012 14:49:54 +0000 (16:49 +0200)
commita147d6113c081694d4209002fa5e57106d4c6f41
treede6f940efa0439ab3d54ff7d280e221b7b59d348
parente825a73f1de308b6ae0ae3cc5549263704a14594
parentf994f9abc6092106659a29f5ee1be0706825c203
Merge commit 'upstream/master'