commit 98ec2e3da9ae79df7aca6898a19c1ab5c5bea388 Merge: 713a44d d3db9cd Author: Mattias Ellert <mattias.ellert at fysast.uu.se> Date: Thu Apr 18 19:32:21 2013 +0200 Merge branch 'el6' ---