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: http://git.cyclocoop.org/?p=cavote.git;a=commitdiff_plain;h=a088209db173fc2bc6017dc77e6dbbf3b10830aa Merge branch 'master' of git.ndn.cx:cavote --- a088209db173fc2bc6017dc77e6dbbf3b10830aa