Upstream merge Bukkit, update Paperclip

This commit is contained in:
Zach Brown 2016-03-21 09:03:17 -05:00
parent d4ba72a83f
commit 7107d8ae53
2 changed files with 2 additions and 2 deletions

2
Bukkit

@ -1 +1 @@
Subproject commit b3f619f3c5ceb503c3649fe16a36b3fc90326a44
Subproject commit 3c2337eebff5dd9ae2497b751586def2571c9470

@ -1 +1 @@
Subproject commit d7d0fdd04744d138ce2b789b29ecb1ef1adf408d
Subproject commit 1d8ff24ec3fff88334498bfb4071b6b6c834cc07