Merge branch 'feature-doxygen'
authordberzano <dario.berzano@cern.ch>
Wed, 11 Feb 2015 21:03:00 +0000 (22:03 +0100)
committerdberzano <dario.berzano@cern.ch>
Wed, 11 Feb 2015 21:03:00 +0000 (22:03 +0100)

Trivial merge