Merge remote-tracking branch 'lucian/master'

This commit is contained in:
James Booth
2014-04-22 23:53:15 +01:00
8 changed files with 83 additions and 10 deletions

View File

@@ -34,7 +34,7 @@ otrlib_policy(void)
char *
otrlib_start_query(void)
{
return "?OTR?v2?";
return "?OTR?v2? This user has requested an Off-the-Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information.";
}
static int

View File

@@ -35,7 +35,7 @@ otrlib_policy(void)
char *
otrlib_start_query(void)
{
return "?OTR?v2?";
return "?OTR?v2? This user has requested an Off-the-Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information.";
}
static const char*