Merge branch 'master' into pre-release

Author: nene

README.md

@@ -159,7 +159,7 @@ reported bugs, submitted patches, and provided a lot of useful input.
 Changelog
 ---------
 
-* 2.0.pre3 - Fixes for the previous pre-release.
+* 2.0.pre4 - Fixes for the previous pre-release.
   * Paging of search results.
   * Support opening classes in tree in new tabs in IE and Firefox.
   * Include upgraded version of prettifier, fixing formatting in IE.
@@ -171,6 +171,8 @@ Changelog
   * Don't exclude static members from singleton classes, simply print
     warning about using @static in singleton class.
 
+* 2.0.pre3 - Bogus release, skipped.
+
 * 2.0.pre2 - Fixes for the previous pre-release.
   * New --stdout command line option.
   * Fix opening links in new tabs.

jsduck.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.7"
 
   s.name = 'jsduck'
-  s.version = '2.0.pre3'
+  s.version = '2.0.pre4'
   s.date = '2011-07-15'
   s.summary = "Simple JavaScript Duckumentation generator"
   s.description = "Documentation generator for ExtJS 4"