Merge branch 'master'
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Wed, 2 Mar 2016 18:53:07 +0000 (19:53 +0100)
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Wed, 2 Mar 2016 18:53:07 +0000 (19:53 +0100)
commitd1af83598f7d6b32516a11bb28e569d592a05c48
tree703283425c2dfccc69506e3ac042f6394a29af03
parent35a5627dc1afa9c40adc64d215821750d4932a52
parent86d5230bb79219ec69786ff5b9add4306d31e986
Merge branch 'master'
doc/doc-docbook/spec.xfpt