commit 9050fd01c9d70ec0981ddfcdf2b361455d3bc784 Merge: 51d9f64 8e3978a Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Mon Sep 29 11:18:14 2014 +0200 Merge remote-tracking branch 'origin/el6' ---