2.6.0:
* WordPress 4.0 compatibility
* Checking the main query to avoid conflicts with other plugins that deal with the main query

git-svn-id: https://plugins.svn.wordpress.org/category-sticky-post/trunk@1010894 b8457f37-d9ea-0310-8a92-e5e31aec5664