Merge remote-tracking branch 'upstream/master'

2013-09-06 01:43:10 +02:00
parent 37c80fd403 cf9be754aa
commit a81757c483
119 changed files with 2195 additions and 914 deletions
--- a/src/plugins/mod_topic.c
+++ b/src/plugins/mod_topic.c
@@ -1,6 +1,6 @@
 /*
 * uhub - A tiny ADC p2p connection hub
- * Copyright (C) 2007-2012, Jan Vidar Krey
+ * Copyright (C) 2007-2013, Jan Vidar Krey
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by