From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 23 Mar 2014 11:41:46 +0000 (+0100)
Subject: Merge branch 'epoxy' of ssh://pannekake.samfundet.no/srv/git.sesse.net/www/movit... 
X-Git-Tag: 1.1~12^2~2
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=34036d849937f22c0addfcba44f65207c96deddc

Merge branch 'epoxy' of ssh://pannekake.samfundet.no/srv/git.sesse.net/www/movit into epoxy
---

34036d849937f22c0addfcba44f65207c96deddc