]> git.mxchange.org Git - friendica.git/commit
Merge commit 'upstream/master'
authorMichael Vogel <icarus@dabo.de>
Sun, 1 Apr 2012 12:11:37 +0000 (14:11 +0200)
committerMichael Vogel <icarus@dabo.de>
Sun, 1 Apr 2012 12:11:37 +0000 (14:11 +0200)
commit7d23149a61f75923b2c71a288a722ee219f5e6ba
treedea64e1cfc15eb6f95e7440e532258dfb909c21c
parent59b45f7fc12027c387f04a2121ea398c1d534626
parentbb67ca9f1c61f96db6da15aee646a20c0b77a255
Merge commit 'upstream/master'