Commit Graph

2 Commits

Author SHA1 Message Date
Julien Duponchelle
33d6fbde21 Fix server tests 2015-07-05 21:14:05 +02:00
Julien Duponchelle
5f6d1bfdd6 Merge branch 'master' into unstable
Conflicts:
	tests/modules/test_manager.py
2015-04-28 10:46:59 +02:00