Merge branch 'master' of git.uio.no:u/erikhf/frm
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 18:53:33 +0000 (19:53 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 18:53:33 +0000 (19:53 +0100)
commitbdfcfbd3fc31a6e3fb3e67d208af2bd38a8ee50a
treea0bf4e248b7c3167194dd55a308992811cbf08dc
parent3981be2bd192be5bad616aed3e9a1f23e5deaba2
parent629b2ffa0c5fa13475c77fcaffb08b919f4238de
Merge branch 'master' of git.uio.no:u/erikhf/frm

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