Merge branch 'feature-parfiles'
authordberzano <dario.berzano@cern.ch>
Thu, 29 Jan 2015 11:58:01 +0000 (12:58 +0100)
committerdberzano <dario.berzano@cern.ch>
Thu, 29 Jan 2015 11:58:01 +0000 (12:58 +0100)

Trivial merge