Merge pull request #3218 from berak:docfix_colormap_30
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 15 Sep 2014 07:34:16 +0000 (07:34 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 15 Sep 2014 07:34:16 +0000 (07:34 +0000)

Trivial merge