Merge branch 'master' of git@github.com:matta/mimetype-fu

lib/mime_types.yml

@@ -50,10 +50,11 @@ blend: application/x-blender
 blender: application/x-blender
 bmp: image/bmp
 bpd: application/vnd.hbci
+builder: application/x-ruby
 bz: application/x-bzip
 bz2: application/x-bzip
-c: text/x-c++src
-\"c++\": text/x-c++src
+c: text/x-csrc
+c++: text/x-c++src
 cab: application/vnd.ms-cab-compressed
 cbr: application/x-cbr
 cbz: application/x-cbz
@@ -138,6 +139,7 @@ eol: audio/vnd.digital-winds
 eps: image/x-eps
 epsf: image/x-eps
 epsi: image/x-eps
+erb: text/rhtml
 erl: text/x-erlang
 es: application/ecmascript
 etheme: application/x-e-theme
@@ -492,6 +494,7 @@ rej: application/x-reject
 req: application/vnd.nervana
 request: application/vnd.nervana
 rgb: image/x-rgb
+rhtml: text/rhtml
 rle: image/rle
 rm: application/vnd.rn-realmedia
 rmj: application/vnd.rn-realmedia
@@ -510,6 +513,7 @@ rst: text/prs.fallenstein.rst
 rt: text/vnd.rn-realtext
 rtf: application/rtf
 rtx: text/richtext
+rxml: application/x-ruby
 rv: video/vnd.rn-realvideo
 rvx: video/vnd.rn-realvideo
 s11: video/vnd.sealed.mpeg1
@@ -523,22 +527,6 @@ s1m: audio/vnd.sealedmedia.softseal.mpeg
 s1n: image/vnd.sealed.png
 s1p: application/vnd.sealed.ppt
 s1q: video/vnd.sealedmedia.softseal.mov
-\"123\": application/vnd.lotus-1-2-3
-mpp: application/vnd.ms-project
-spf: application/vnd.yamaha.smaf-phrase
-kar: audio/x-midi
-mid: audio/x-midi
-3gp: video/3gpp
-3g2: video/3gpp2
-hqx: application/mac-binhex40
-p7s: application/pkcs7-signature
-ppm: image/x-portable-pixmap
-pspimage: image/x-paintshoppro
-cdf: application/netcdf
-texinfo: application/x-texinfo
-sjp: image/vnd.sealedmedia.softseal.jpg
-wbs: application/vnd.criticaltools.wbs+xml
-emm: application/vnd.ibm.electronic-media
 s1w: application/vnd.sealed.doc
 s3m: audio/x-s3m
 saf: application/vnd.yamaha.smaf-audio