Andreas Preikschat cd69d2f930 head + conflicts		2012-12-05 22:10:20 +01:00
..
alerts	trunk + conflicts	2012-12-04 22:50:14 +01:00
bibles	head + conflicts	2012-12-05 22:10:20 +01:00
custom	head + conflicts	2012-12-05 22:10:20 +01:00
images	trunk + conflicts	2012-12-04 22:50:14 +01:00
media	fixed branch	2012-12-05 21:33:39 +01:00
presentations	fixed branch	2012-12-05 21:33:39 +01:00
remotes	trunk + conflicts	2012-12-04 22:50:14 +01:00
songs	head + conflicts	2012-12-05 22:10:20 +01:00
songusage	trunk + conflicts	2012-12-04 22:50:14 +01:00
__init__.py	Copyright and Translation updates from 2.0	2012-12-01 07:57:54 +00:00