Julien Duponchelle 5f6d1bfdd6 Merge branch 'master' into unstable
Conflicts:
	tests/modules/test_manager.py
2015-04-28 10:46:59 +02:00
..
2015-04-27 23:28:12 +02:00
2015-02-24 11:39:17 +01:00
2015-02-16 17:20:07 +01:00
2015-02-06 11:31:54 +01:00