paul.baranowski b6d117d456 Fixed merge conflicts

2011-02-14 13:16:57 +01:00

..

help.phtml

Fixed merge conflicts

2011-02-14 13:16:57 +01:00

index.phtml

-small fixes

2011-02-10 20:48:26 -05:00