From: Julie Hill Roa <julie.hill.roa@gmail.com>
Date: Sun, 6 Dec 2015 18:53:33 +0000 (+0100)
Subject: Merge branch 'master' of git.uio.no:u/erikhf/frm
X-Git-Url: http://git.uio.no/git/?p=u%2Ferikhf%2Ffrm.git;a=commitdiff_plain;h=bdfcfbd3fc31a6e3fb3e67d208af2bd38a8ee50a

Merge branch 'master' of git.uio.no:u/erikhf/frm

* 'master' of git.uio.no:u/erikhf/frm:
  litt design
---

bdfcfbd3fc31a6e3fb3e67d208af2bd38a8ee50a