Merge branch 'master' into windows

This commit is contained in:
James Booth
2013-08-28 23:40:08 +01:00

View File

@@ -1,7 +1,9 @@
Profanity
=========
Profanity is a console based jabber client inspired by [Irssi](http://www.irssi.org/),
Profanity is a console based XMPP client inspired by [Irssi](http://www.irssi.org/),
![alt tag](http://www.profanity.im/images/prof-1.png)
See the [User Guide](http://www.profanity.im/userguide.html) for information on installing, upgrading and using Profanity.