Merge branch 'windows+cc' into cairocanvas
authorJohn Emmas <johne53@tiscali.co.uk>
Sun, 12 Jan 2014 17:45:28 +0000 (17:45 +0000)
committerJohn Emmas <johne53@tiscali.co.uk>
Sun, 12 Jan 2014 17:45:28 +0000 (17:45 +0000)

Trivial merge