Merge changes I33cd59e6,I8a2e539f
authorChristoph Junghans <junghans@votca.org>
Thu, 26 Jul 2012 22:41:06 +0000 (00:41 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 26 Jul 2012 22:41:06 +0000 (00:41 +0200)
* changes:
  Draft support for multiple help output formats.
  Improve option initialization in traj. analysis.


Trivial merge