Update to 1.7.5
Don't print permgen warning for java 8+
this.t() -> this.u() - make the server actually tick!
Check for manually prefixed commands or commands that don't need a prefix for calling vanilla commands with command blocks
Automatically update upstream versions. Bukkit-1.7.2-R0.3-7-g4a47cf3, CraftBukkit-1.7.2-R0.3-6-ga3ae0c6
Fix some merge conflicts
Fix the removal of potion effects
Cap villagers' window name to prevent client disconnects
Re-add missed method to the Player Collision API
Automatically update upstream versions. Bukkit-1.7.2-R0.3-7-g4a47cf3, CraftBukkit-1.7.2-R0.3-7-g13c4801
Fix conflicts
Fix missed diff in TileEntityHopper
Move part of the Watchdog patch back into the correct patch

I have no idea how I managed to mess this up
Disable reload by default, move the Reload command from Bukkit to CraftBukkit