news
news
Merge branch 'master' of github.com:xbegault/lesdragonshockey

Conflicts:
	mod_joomla/com_jupgrade_2-5-11_fr-en.zip
	mod_joomla/hockey/20110610/French_language_pack.zip
	mod_joomla/hockey/20110610/com_hockey_20110610_r24.zip
	mod_joomla/hockey/20110610/mod_calendar_20110610_r24.zip
	mod_joomla/hockey/20110610/mod_matchdays_20110610_r24.zip
	mod_joomla/hockey/20110610/mod_scoreboard_20110610_r24.zip
	mod_joomla/hockey/20110610/mod_standings_20110610_r24.zip
	mod_joomla/hockey/20110610/mod_topplayer_20110610_r24.zip
	mod_joomla/hockey/20110610/rhuk_milkyway.rar
	mod_joomla/hockey/20110906/com_hockey_20121004_r2.zip
	mod_joomla/hockey/20110906/fr-FR.com_hockey.zip
	mod_joomla/hockey/20110906/mod_calendar_20121004_r2.zip
	mod_joomla/hockey/20110906/mod_matchdays_20110906_r2.zip
	mod_joomla/hockey/20110906/mod_scoreboard_20121004_r2.zip
	mod_joomla/hockey/20110906/mod_standings_20110906_r2.zip
	mod_joomla/hockey/20110906/mod_topplayer_20110906_r2.zip
	mod_joomla/hockey/20110906/module_style.zip
	mod_joomla/joomleague/com_joomleague-1.6.0.0561518.zip
	mod_joomla/joomleague/com_joomleague-2.71.146.2c03638.zip
	mod_joomla/joomleague/fr-FR.JoomLeague.zip