Merge branch 'master' of github.com:tenderlove/psych

* 'master' of github.com:tenderlove/psych:
  [#163] Add license to gemspec, is MIT
  * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]   #161

CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+Fri Sep 20 23:44:07 2013  Zachary Scott  <e@zzak.io>
+
+        * ext/psych/yaml/yaml.h: [DOC] fix typo by @GreenGeorge [Fixes GH-161]
+          https://github.com/tenderlove/psych/pull/161
+
 Fri Sep  6 02:37:22 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when

Rakefile

@@ -14,6 +14,7 @@ require "rake/extensiontask"
 Hoe.plugin :doofus, :git, :gemspec, :isolate
 
 $hoe = Hoe.spec 'psych' do
+  license   'MIT'
   developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
 
   self.extra_rdoc_files  = Dir['*.rdoc']

ext/psych/yaml/yaml.h

@@ -1851,7 +1851,7 @@ YAML_DECLARE(void)
 yaml_emitter_set_canonical(yaml_emitter_t *emitter, int canonical);
 
 /**
- * Set the intendation increment.
+ * Set the indentation increment.
  *
  * @param[in,out]   emitter     An emitter object.
  * @param[in]       indent      The indentation increment (1 < . < 10).