Merge branch 'master' of git://github.com/friendica/friendica
authorVasudev Kamath <kamathvasudev@gmail.com>
Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
committerVasudev Kamath <kamathvasudev@gmail.com>
Sat, 12 May 2012 14:50:26 +0000 (20:20 +0530)
commit3a45d4f9e0af301b8fdd4d509fc7ffe7514fb519
tree14ee4aff19204d7f4e0fe679f48406c06af36187
parent10db2f00f9f90cb7ee9fbd94a5c986427de779c2
parent9699d9cd019cb668afdf0e0c9c390d331fcc6240
Merge branch 'master' of git://github.com/friendica/friendica
view/theme/diabook/communityhome.tpl
view/theme/diabook/theme.php