Merge branch 'master' of github.com:matrix-org/synapse into develop

Conflicts:
	CHANGES.rst

4 files changed, 16 insertions, 15 deletions

diff --git a/CHANGES.rst b/CHANGES.rst
index c6fab8fb72..31eee891da 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,18 +1,19 @@
 Changes in synapse 0.2.1 (2014-09-03)
 =====================================
-Webclient:
- * Implement 3PID login via email address
- * Support for user management via IRC-style /kick, /ban/, /op
-   style slash commands
- * Display user power levels in room member list as a red bar
 
 Homeserver:
- * Add synctl init.d style control script
- * Implement identity server integration for 3PID signup
- * Implement rate limiting
- * Implement content upload size limiting
- * Bug fixes to power_levels
+ * Added support for signing up with a third party id.
+ * Add synctl scripts.
+ * Added rate limiting.
+ * Add option to change the external address the content repo uses.
+ * Presence bug fixes.
 
+Webclient:
+ * Added support for signing up with a third party id.
+ * Added support for banning and kicking users.
+ * Added support for displaying and setting ops.
+ * Added support for room names.
+ * Fix bugs with room membership event display.
 
 Changes in synapse 0.2.0 (2014-09-02)
 =====================================
diff --git a/VERSION b/VERSION
index 0ea3a944b3..0c62199f16 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 564d789645..440e633966 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
diff --git a/synctl b/synctl
index 763bcce0a0..99dc545ba5 100755
--- a/synctl
+++ b/synctl
@@ -4,6 +4,7 @@ SYNAPSE="synapse/app/homeserver.py"
 
 CONFIGFILE="homeserver.yaml"
 PIDFILE="homeserver.pid"
+LOGFILE="homeserver.log"
 
 GREEN=$'\e[1;32m'
 NORMAL=$'\e[m'
@@ -21,13 +22,12 @@ case "$1" in
     fi
 
     echo -n "Starting ..."
-    $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file synapse.log
+    $SYNAPSE --daemonize -c "$CONFIGFILE" --pid-file "$PIDFILE" --log-file "$LOGFILE"
     echo "${GREEN}started${NORMAL}"
     ;;
   stop)
     echo -n "Stopping ..."
-    test -f $PIDFILE && kill `cat $PIDFILE`
-    echo "${GREEN}stopped${NORMAL}"
+    test -f $PIDFILE && kill `cat $PIDFILE` && echo "${GREEN}stopped${NORMAL}"
     ;;
   restart)
     $0 stop && $0 start