commit 0d3e24b9a5e748c425516c18cd802a23e413aa4c Merge: 2a029ae a6b0c40 Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Tue Jul 15 10:49:29 2014 +0200 Merge remote-tracking branch 'origin/el6' ---