Zef Hemel ba4497e068 Merge remote-tracking branch 'origin/master' into placeholders		2011-11-16 11:08:54 +01:00
..
ace	Merge remote-tracking branch 'origin/master' into placeholders	2011-11-16 11:08:54 +01:00
pilot	add canon to migration list	2011-11-10 17:16:08 +01:00