Merge release 1.0.4
treea23a14a572fd1dc5db2ce375e7b4a8c3ce866cd5
-rw-r--r-- 579 .hgignore
-rw-r--r-- 2112 .hgsigs
drwxr-xr-x - mcabber