Commit Graph

6 Commits

Author SHA1 Message Date
Thinkofdeath
e21770a060 Upstream merge 2014-05-14 14:02:09 +01:00
md_5
2031db9986 Rebuild patches from last few PRs 2014-05-06 16:10:35 +10:00
Zach Brown
928f6e1ea3 Automatically set connection throttle for bungee configurations 2014-05-06 16:05:07 +10:00
md_5
50a70a29e4 More upstream merge 2014-04-19 09:15:37 +10:00
md_5
74c808df0f Upstream merge 2013-12-09 18:01:02 +11:00
md_5
af7cb96f76 Upstream merge 2013-12-03 08:21:46 +11:00