Merge branch 'release/1.0.0'

README.md

@@ -1,4 +1,4 @@
-# CloudBot [![Build Status](https://travis-ci.org/CloudBotIRC/CloudBot.svg?branch=python3.4)](https://travis-ci.org/CloudBotIRC/CloudBot) [![Coverage Status](https://coveralls.io/repos/CloudBotIRC/CloudBot/badge.png?branch=python3.4)](https://coveralls.io/r/CloudBotIRC/CloudBot?branch=python3.4)
+# CloudBot [![Build Status](https://travis-ci.org/CloudBotIRC/CloudBot.svg?branch=master)](https://travis-ci.org/CloudBotIRC/CloudBot) [![Coverage Status](https://coveralls.io/repos/CloudBotIRC/CloudBot/badge.png?branch=master)](https://coveralls.io/r/CloudBotIRC/CloudBot?branch=master)
 
 CloudBot Refresh is the newest generation of CloudBot, the fun, fast, extendable Python IRC bot!
 
@@ -51,6 +51,9 @@ If you think you have found a bug/have a idea/suggestion, please **open a issue*
 
 You can find a number of example bots in [#CloudBot](irc://irc.esper.net/cloudbot "Connect via IRC to #CloudBot on irc.esper.net").
 
+## Changelog
+ - **1.0.0** - Initial stable release
+
 ## License
 
 CloudBot is **licensed** under the **GPL v3** license. The terms are as follows.

cloudbot/__init__.py

@@ -11,7 +11,7 @@
 import logging
 import os
 
-__version__ = "0.1.1.dev0"
+__version__ = "1.0.0 Stable"
 
 __all__ = ["util", "bot", "connection", "config", "permissions", "plugin", "event", "hook", "log_dir"]