Merge branch 'develop'

Lokaltog · Lokaltog · commit dfb8079d8c29 · 2011-04-03T17:37:48.000+02:00
* develop:
  Bump version
diff --git a/doc/easymotion.txt b/doc/easymotion.txt
@@ -1,4 +1,4 @@
-*easymotion.txt*	Version 1.1.1.  Last change: 2011 Apr 1
+*easymotion.txt*	Version 1.2.  Last change: 2011 Apr 3
 
 
             ______                  __  ___       __  _

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-easymotion.txt Version 1.1.1. Last change: 2011 Apr 1`
	`1`	`+easymotion.txt Version 1.2. Last change: 2011 Apr 3`
`2`	`2`
`3`	`3`
`4`	`4`	`______ __ ___ __ _`