Merge https://github.com/annando/friendica into annando
authorfriendica <info@friendica.com>
Sun, 23 Dec 2012 07:02:21 +0000 (23:02 -0800)
committerfriendica <info@friendica.com>
Sun, 23 Dec 2012 07:02:21 +0000 (23:02 -0800)
commita29842e3019255efd3f91fc01df29f5837d54fa4
tree0486989ff5182865e5f5422a28a1cd1a52af154e
parent453082516e90aba59553fd4392b2cdfed6ae9a57
parentb0759e9a9f579b573b14b10338ab0fa58126824a
Merge https://github.com/annando/friendica into annando

Conflicts:
view/admin_site.tpl
mod/admin.php
view/admin_site.tpl
view/theme/vier/theme.php
view/theme/vier/wall_thread.tpl