merge with bitbucket.org/christian/pygments-main, pull request #171
merge with bitbucket.org/christian/pygments-main, pull request #171

zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,sol/pygments,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,sol/pygments,sol/pygments,sol/pygments,zmughal/pygments-mirror,sol/pygments,zmughal/pygments-mirror,sol/pygments,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,sol/pygments,zmughal/pygments-mirror,zmughal/pygments-mirror,zmughal/pygments-mirror,zmughal/pygments-mirror