Merge branch 'f-chart-picker-in-gl'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 13 Jan 2017 13:41:53 +0000 (14:41 +0100)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Fri, 13 Jan 2017 13:41:53 +0000 (14:41 +0100)

Trivial merge