Merge remote-tracking branch 'vnwildman/master'
authorPat Thoyts <patthoyts@users.sourceforge.net>
Sun, 29 Jun 2014 11:59:15 +0000 (12:59 +0100)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Sun, 29 Jun 2014 11:59:15 +0000 (12:59 +0100)
Trivial merge