Merge branch 'master' into pgp

This commit is contained in:
James Booth
2015-04-19 16:56:11 +01:00
10 changed files with 10 additions and 10 deletions

View File

@@ -44,7 +44,7 @@
#include "log.h"
#include "muc.h"
#include "profanity.h"
#include "server_events.h"
#include "event/server_events.h"
#include "xmpp/capabilities.h"
#include "xmpp/connection.h"
#include "xmpp/stanza.h"