commit a7f6f77d0d882d0810cb0b3abed5c37a0a3520af Merge: d4959f3 5987428 Author: Steve Traylen <steve.traylen at cern.ch> Date: Mon Aug 6 11:55:15 2012 +0200 Merge branch 'master' into el6 .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) ---