Merge branch 'master' of http://github.com/erikl/friendika into erikl-master
authorFriendika <info@friendika.com>
Thu, 17 Mar 2011 21:44:06 +0000 (14:44 -0700)
committerFriendika <info@friendika.com>
Thu, 17 Mar 2011 21:44:06 +0000 (14:44 -0700)
commit6b37e6d48d8d7a313d2eb88155752241c6c930d5
tree46af2ae9350d3f1d27fffbdac0aa5e753c206b93
parent90178f86cb02cc3b6d2b7e5d49222dfeec0e8921
parente94ae8d396b8583407b140faf211f4f92a503bc6
Merge branch 'master' of github.com/erikl/friendika into erikl-master

Conflicts:
view/sv/contact_edit.tpl
view/sv/strings.php
view/sv/strings.php