Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 07:58:09 +0000 (09:58 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 07:58:09 +0000 (09:58 +0200)
commita48c0c41c4dee06d5d99afd02ebf683135b95f78
treecc00bad633c1c7298b082f0939329dcf31741058
parentd4bb093ad35aa0a85d920d9c258d21ed818a05ab
parent1a469a5e423bdad779b8534247dea8cc86169b88
Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'

* commit '1a469a5e423bdad779b8534247dea8cc86169b88':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbe2648ac5cb0e5a146f7e843310002199a

Merged-by: Clément Bœsch <cboesch@gopro.com>