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
..
notmyidea	Merge remote-tracking branch 'muffinresearch/master'	2012-05-11 16:17:47 +02:00
simple/templates	Merge pull request #243 from alefteris/patch-1	2012-03-12 04:14:32 -07:00