Merge branch 'master' into vfolder
authorMichael Rasmussen <mir@datanom.net>
Mon, 17 Nov 2014 16:33:04 +0000 (17:33 +0100)
committerMichael Rasmussen <mir@datanom.net>
Mon, 17 Nov 2014 16:33:04 +0000 (17:33 +0100)

Trivial merge