Merge remote-tracking branch 'friendika/master' into newacl
authorFabio Comuni <fabrix.xm@gmail.com>
Wed, 20 Jul 2011 08:01:12 +0000 (10:01 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Wed, 20 Jul 2011 08:01:12 +0000 (10:01 +0200)
1  2 
view/jot-header.tpl
view/theme/duepuntozero/style.css

Simple merge
Simple merge