[meld] Pre-release version bump

[Kai Willadsen <kaiw src gnome org>]

commit e3dbf8d2cf130533b9e78812f1858cc632066cb3
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Apr 28 07:09:24 2012 +1000

    Pre-release version bump

 meld/meldapp.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index e8085ce..20544b5 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -27,7 +27,7 @@ import gtk
 import misc
 import preferences
 
-version = "1.5.4"
+version = "1.6.0"
 
 
 class FilterEntry(object):