Merge branch 'kinke-vs15'
authorMark Lindner <mark.a.lindner@gmail.com>
Sat, 15 Aug 2015 03:58:28 +0000 (21:58 -0600)
committerMark Lindner <mark.a.lindner@gmail.com>
Sat, 15 Aug 2015 03:58:28 +0000 (21:58 -0600)
commit122f68725f7b7b91fe041ae8517bba89f3ae328c
treeeda3917a0c6395465462df9e92165f4cf8bbcc94
parentf9f23d7a95608936ea7d839731dbd56f1667b7ed
parent13d7483e8f5e8662b8de7a1778da1bff3c879bfb
Merge branch 'kinke-vs15'