Alexis Metaireau 419a2159e6 Merge remote-tracking branch 'muffinresearch/master' ... Conflicts: docs/settings.rst tests/test_generators.py		2012-05-11 16:17:47 +02:00
..
css	Merge remote-tracking branch 'muffinresearch/master'	2012-05-11 16:17:47 +02:00
images/icons	Added facebook icon to default theme.	2012-04-10 12:51:16 -04:00