]> git.mxchange.org Git - friendica.git/commit - view/theme/diabook-red/icons/contacts.png
Merge remote branch 'upstream/master'
authorzottel <github@zottel.net>
Sun, 15 Apr 2012 12:11:11 +0000 (14:11 +0200)
committerzottel <github@zottel.net>
Sun, 15 Apr 2012 12:11:11 +0000 (14:11 +0200)
commita2c4ce74871dbe9e640cdeafc1574bda5b7fe144
treefce1c1b2d497adae72d77e09c6bf005c8900256b
parent0bad8de0562a50fa93b0af5fd4cf8d7123a11b46
parentf299749758112361ee6384cd75d11b2c3a57352a
Merge remote branch 'upstream/master'