Merge branch 'epoxy' of ssh://pannekake.samfundet.no/srv/git.sesse.net/www/movit...
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 11:41:46 +0000 (12:41 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sun, 23 Mar 2014 11:41:46 +0000 (12:41 +0100)
1  2 
init.cpp

diff --cc init.cpp
Simple merge