From: Jon Langseth <jon.langseth@lilug.no>
Date: Tue, 13 Mar 2012 19:50:48 +0000 (+0100)
Subject: Merge branch 'master' of http://git.defcon.no/YAVote
X-Git-Url: https://git.defcon.no/?p=YAVote;a=commitdiff_plain;h=3cb57c6708fa0ad2d6c9a6276b759279cbc3a5cc

Merge branch 'master' of http://git.defcon.no/YAVote
---

3cb57c6708fa0ad2d6c9a6276b759279cbc3a5cc