Merge.

vimperator/Makefile

@@ -1,6 +1,6 @@
 #### configuration
 
-VERSION       = 1.0pre
+VERSION       = 2.3a1pre
 NAME          = vimperator
 
 include ../common/Makefile

vimperator/NEWS

@@ -1,11 +1,12 @@
 2009-XX-XX:
+    * version 2.3a1pre
     * add basic plugin authorship documentation
     * plugins may now provide full-fleged ':help' documentation
     * asciidoc is no longer required to build Vimperator
     * the help system is newly modularized
 
-2009-XX-XX:
-    * version 2.2a1pre
+2009-10-28:
+    * version 2.2
     * IMPORTANT: Vimperator's licence has changed from the MPL/GPL/LGPL
       tri-license to the MIT license.
     * IMPORTANT: Map.flags has been replaced with individual properties.