Merge branch 'refs/heads/t/dbdir-fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Wed, 14 Sep 2016 11:16:27 +0000 (13:16 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Wed, 14 Sep 2016 11:16:27 +0000 (13:16 +0200)
The topic branch started on 2016-06-02 and was cooking since
2016-06-24. It contains a single fix.

* refs/heads/t/dbdir-fix:
  Abort if neither --database-dir nor --base-dir is given.


Trivial merge