From: Jon Langseth <jon.langseth@hig.no>
Date: Tue, 17 Jan 2012 18:08:51 +0000 (+0100)
Subject: Merge http://git.defcon.no/hermes
X-Git-Url: https://git.defcon.no/?a=commitdiff_plain;h=84ad3d162f09001c5378420250a2998f7d48fbe8;p=hermes

Merge http://git.defcon.no/hermes
---

84ad3d162f09001c5378420250a2998f7d48fbe8