Merge remote-tracking branch 'refs/remotes/origin/neoView'

Author Tyxz <arne@rantzen.net>
Author date 2016-08-01 18:23:31
Author local date 2016-08-01 20:23:31 +0200
Committer Tyxz <arne@rantzen.net>
Committer date 2016-08-01 18:23:31
Committer local date 2016-08-01 20:23:31 +0200
Commit 531c030a3f66b501e6c3aa3072453a532f259b73
Tree fc63731f1f05c58d306245dd1d9f0f6a39336581
Parent 8ff9193882530cd1991ca41dcc0a1cd31b51f6a4
Parent c4253ba9084dc57a9d0bf9cc85e934a349a81a3a
Merge remote-tracking branch 'refs/remotes/origin/neoView'