Merge branch 'vendor/NVI2'
authorJohn Marino <draco@marino.st>
Sat, 8 Aug 2015 16:58:59 +0000 (18:58 +0200)
committerJohn Marino <draco@marino.st>
Sat, 8 Aug 2015 16:58:59 +0000 (18:58 +0200)
commit48a77267bbaa6d5859acb2b336dbf1da36437dc6
treedf06a590d4cb9c1d3dfca5090d98570c9da8834c
parent5978d936be51c5201ed3a2be4458a93b54b7d2d6
parente0b8e63ec8faba710eccfbba72a18b7831676e0c
Merge branch 'vendor/NVI2'