From: Jon Langseth <jon.langseth@lilug.no>
Date: Thu, 26 Jan 2012 11:19:12 +0000 (+0100)
Subject: Merge branch 'master' of http://git.defcon.no/hermes
X-Git-Url: https://git.defcon.no/?p=hermes;a=commitdiff_plain;h=32b42c418a3bc21529c8992916c6ead97c15ff1e

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

32b42c418a3bc21529c8992916c6ead97c15ff1e