From: Arnaud Delcasse Date: Sat, 18 Aug 2012 16:53:27 +0000 (+0200) Subject: Merge branch 'master' of git.ndn.cx:cavote X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27static%27%2C%20filename=%27css/%22%24fichier/%7B%7B%20attachment.url%20%7D%7D?a=commitdiff_plain;h=a088209db173fc2bc6017dc77e6dbbf3b10830aa;p=cavote.git Merge branch 'master' of git.ndn.cx:cavote --- a088209db173fc2bc6017dc77e6dbbf3b10830aa