2013-06-17 - production
10:50	<hashar>	manually rebased mediawiki-config on fenari 7d10d3f --> 1d2093e	[production]