From: Jon Langseth <jon.langseth@hig.no>
Date: Tue, 14 May 2013 11:26:04 +0000 (+0200)
Subject: Merge http://git.defcon.no/trk
X-Git-Url: https://git.defcon.no/?p=trk;a=commitdiff_plain;h=171768180fbc5960d49fe3f3616429198fdc7a37

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

171768180fbc5960d49fe3f3616429198fdc7a37