Merge branch 'code-style' into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 10 Jun 2016 16:02:22 +0000 (18:02 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 10 Jun 2016 16:02:22 +0000 (18:02 +0200)
commit8d3a6d3ee6a62c61f12e1374e447bdacdd0eb080
tree3f071d12015a750db1350b1b1253f7e074ae9dfb
parent82a28f00b9640f9fd23219ffea289fbd676ce946
parent4421581ee36814d4857b1a503f771777f03e5bac
Merge branch 'code-style' into next