Revision a7357a028eb4248a05b7aea9cb3872964ac20e1f

Committed on 16/03/2017 1:32 am by André R <ar@ez.no> [GitHub Diff]

Merge branch '1.2'