Merge pull request #17 from mrtee/master

Please include the OTR encryption support in net-im/mcabber by default

conf/armarch/portage/package.use/00-sabayon.package.use

@@ -104,6 +104,7 @@ gnome-base/gvfs gdu
 gnome-base/gnome-settings-daemon packagekit policykit
 gnome-base/gconf policykit
 net-im/empathy gnome-online-accounts
+net-im/mcabber otr
 mail-client/evolution networkmanager
 x11-libs/gtk+ X
 gnome-base/gnome-menus python

conf/intel/portage/package.use/00-sabayon.package.use

@@ -589,6 +589,7 @@ net-im/kadu xmpp
 net-im/pidgin bonjour console gadu groupwise meanwhile msn prediction qq sasl silc -zephyr
 net-im/psi jingle
 net-im/telepathy-connection-managers -icq -yahoo
+net-im/mcabber otr
 
 net-irc/inspircd mysql sqlite
 net-irc/kvirc -audiofile dcc_video