Alexander Kampmann 355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php		2012-04-05 13:39:15 +02:00
..
Bool.php
Class.php
Color.php
FrameTarget.php
ID.php
Length.php
LinkTypes.php
MultiLength.php
Nmtokens.php
Pixels.php