Marc Alexander c260b90488 Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x ...

Conflicts:
	root/portal/modules/portal_birthday_list.php

2013-06-09 16:52:07 +02:00

..

template

Merge remote-tracking branch 'marc1706/ticket/120' into develop-2.1.x

2013-06-09 16:52:07 +02:00

theme

[feature/jquery_clock] Add jQuery clock to subsilver2

2013-03-02 23:29:21 +01:00