Revision 4de960c7 version

b/version
1 
<<<<<<< HEAD
2 1 
0.7next
3 
=======
4 
0.7.1
5 
>>>>>>> hotfix-0.7.1

Also available in: Unified diff