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
..
Background.php
BdoDir.php
BgColor.php
BoolToCSS.php
Border.php
EnumToCSS.php
ImgRequired.php
ImgSpace.php
Input.php
Lang.php
Length.php
Name.php
NameSync.php
SafeEmbed.php
SafeObject.php
SafeParam.php
ScriptRequired.php
Textarea.php