..
Latest dev build from bukkit
Latest dev build of bukkit
Resolve conflicts
Update to latest dev builds
Take a guess at some new names..
Bring 1.7.2 framework up to speed with other changes
Bring back jars
Merge branch 'master' into bukkit-1.7.2
Merge pull request #1 from Runsafe/bukkit-1.7.2

Bukkit 1.7.2