tree 85d9d322d8aa117f0975995a834a2180698d8c61
parent a9a51284028d027c6350bfe9b9f65540960af417
parent 354dd9b35a0272cf93999f1396b9fd377c6ec0c7
author Anand Doshi <anand@iwebnotes.com> 1328166819 +0530
committer Anand Doshi <anand@iwebnotes.com> 1328166819 +0530

Merge branch 'stable' into latest

Conflicts:
	version.num