Merge branch 'master' of gitorious.org:agenda-du-libre-rails/agenda-du-libre-rails; branch 'master' of new.agendadulibre.org:/var/www/agendadulibre-rails

This commit is contained in:
echarp 2015-03-01 17:15:32 +01:00
commit ed098812e8

Diff Content Not Available