Merge pull request #47 in SPIGOT/craftbukkit from ~BAMMERBOM/craftbukkit:master to master

* commit '19809a048c1b1d73d0b7d6a833a5c638364f2026':
  Fix making craftbukkit patches.

By: md_5 <me@md-5.net>

paper-server/makePatches.sh

@@ -12,6 +12,7 @@ for file in $(/bin/ls $cb)
 do
     echo "Diffing $file"
     sed -i 's/\r//' "$nms/$file"
+	sed -i 's/\r//' "$cb/$file"
     outName=$(echo nms-patches/"$(echo $file | cut -d. -f1)".patch)
     patchNew=$(diff -u "$nms/$file" "$cb/$file")
     if [ -f "$outName" ]