Merge branch 'master' of git.ndn.cx:cavote
authorArnaud Delcasse <arnaud@delcasse.fr>
Sat, 18 Aug 2012 16:53:27 +0000 (18:53 +0200)
committerArnaud Delcasse <arnaud@delcasse.fr>
Sat, 18 Aug 2012 16:53:27 +0000 (18:53 +0200)

Trivial merge