Merge branch 'user/jkotrla/lp1624366-added_content_obalkyknih' of git://git.evergreen... user/jkotrla/lp1624366-added_content_obalkyknih
authorJakub Kotrla <jakub@kotrla.net>
Thu, 5 Jan 2017 23:12:39 +0000 (00:12 +0100)
committerJakub Kotrla <jakub@kotrla.net>
Thu, 5 Jan 2017 23:12:39 +0000 (00:12 +0100)

Trivial merge