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
..
AlphaValue.php
Background.php
BackgroundPosition.php
Border.php
Color.php
Composite.php
DenyElementDecorator.php
Filter.php
Font.php
FontFamily.php
ImportantDecorator.php
Length.php
ListStyle.php
Multiple.php
Number.php
Percentage.php
TextDecoration.php
URI.php