Merge branch 'vsbuffalo-master' into develop
authorPetr Danecek <pd3@sanger.ac.uk>
Thu, 13 Dec 2012 07:49:32 +0000 (07:49 +0000)
committerPetr Danecek <pd3@sanger.ac.uk>
Thu, 13 Dec 2012 07:49:32 +0000 (07:49 +0000)

Trivial merge