Max Klaversma fa5752d9ce Merge remote-tracking branch 'origin/master' ...

Conflicts:
	application/plugins/Donations.php

2014-05-02 17:53:37 +02:00

..

ChatMessagePlugin.php

applied common formatting

2014-05-02 17:40:47 +02:00

Donations.php

Changed /topdons to use StatisticsManager

2014-05-02 17:50:22 +02:00

Karma.php

applied common formatting

2014-05-02 17:40:47 +02:00

WidgetPlugin.php

applied common formatting

2014-05-02 17:40:47 +02:00