Merge branch 'master' of ssh://home.bebif.be/usr/local/repos/git/yeti

7dfccd96 · Julien Cigar · 8aedf0a5 · 4f5a6e49 · 7dfccd96
Commit 7dfccd96 authored Mar 15, 2012 by Julien Cigar
--- a/core.js
+++ b/core.js
@@ -72,7 +72,7 @@
                html : 'text/html',
                xml : 'application/xml, text/xml',
                text : 'text/plain'
-            }
+            },

            /* Default options */
            options = {