shortcodes parsed by I make plugins :(

git-svn-id: https://plugins.svn.wordpress.org/coolclock/trunk@927985 b8457f37-d9ea-0310-8a92-e5e31aec5664
resolved conflict

git-svn-id: https://plugins.svn.wordpress.org/coolclock/trunk@927986 b8457f37-d9ea-0310-8a92-e5e31aec5664