Merge branch 'pull'
authorFriendika <info@friendika.com>
Sat, 3 Sep 2011 02:28:06 +0000 (19:28 -0700)
committerFriendika <info@friendika.com>
Sat, 3 Sep 2011 02:28:06 +0000 (19:28 -0700)
commit574470bf1c9ee8663facfa007192fd3d7ee9044d
treee9b73674ca4669a680d754ef6c8b0a2fc3672193
parentf186863523bc8f9c6e28d593231247936ba7f931
parent887d06cf5edda2ae390c15abf0ec33b39d74e589
Merge branch 'pull'