Merge branch 'feature-doxygen'
authordberzano <dario.berzano@cern.ch>
Tue, 10 Feb 2015 15:42:03 +0000 (16:42 +0100)
committerdberzano <dario.berzano@cern.ch>
Tue, 10 Feb 2015 15:42:03 +0000 (16:42 +0100)

Trivial merge