Revision eb98e971dad1c584b5260e41532b98cda0cf1079

Committed on 11/02/2014 3:51 am by Arne <bratt@nvg.ntnu.no> [GitHub Diff]

Merge branch 'cache-solution'

Conflicts:
classes/dictionaryLogic.php