commit 885256218bd0e81e018e8702747707d9e8d9a4da Merge: 020380f cfad0ef Author: Terje Røsten <terje.rosten at ntnu.no> Date: Sat Mar 8 15:02:36 2014 +0100 Merge branch 'master' into f20 ---