Merge branch 'master' of github.com:annando/friendica-addons
authorMichael Vogel <icarus@dabo.de>
Fri, 25 Jan 2013 23:24:39 +0000 (00:24 +0100)
committerMichael Vogel <icarus@dabo.de>
Fri, 25 Jan 2013 23:24:39 +0000 (00:24 +0100)
commit0c03f13a96fc6cdb2bc6e3bf926297ad7a70b17e
tree5fe5bae861716820fad7ec41fae9289f4d32611f
parent9f6b64a8fd145eba8959c1b03b11e442df70d37b
parentdaf3f9b8e88d6114bd4d8f5e9f34b1ebc0a06c69
Merge branch 'master' of github.com:annando/friendica-addons