Merge remote-tracking branch 'upstream/master' into solarized
authorasmod3us <4sm0d3us@gmail.com>
Thu, 28 Feb 2013 16:28:07 +0000 (17:28 +0100)
committerasmod3us <4sm0d3us@gmail.com>
Thu, 28 Feb 2013 16:28:07 +0000 (17:28 +0100)

Trivial merge