Merge remote branch 'friendica/master'
authorFabrixxm <fabrix.xm@gmail.com>
Fri, 15 Feb 2013 08:17:59 +0000 (03:17 -0500)
committerFabrixxm <fabrix.xm@gmail.com>
Fri, 15 Feb 2013 08:17:59 +0000 (03:17 -0500)
commitf1a0aeb480542255fd2aae261382a756779b3d98
treefce8d7777267cfc9c7b2c2aa9b31621ac374966e
parent5f80467a8f83250354cf4d0a4889ae78c03c0146
parentc5b8082c311cf5a3ccdbc04abbe9f6fc476485c2
Merge remote branch 'friendica/master'
boot.php