fix conflicts
authorAlessandro Cosentino <cosenal@gmail.com>
Sat, 18 Aug 2012 03:01:13 +0000 (23:01 -0400)
committerAlessandro Cosentino <cosenal@gmail.com>
Sat, 18 Aug 2012 03:01:13 +0000 (23:01 -0400)
commit5ab7fd72638ffd98832c867994eb1d55dc7e7fc0
treef04bdc2628d7a0ff2f24130fb812a110c2152df1
parent264800e6577bc799d0e0c8a3ade095a8509c140c
parent964ef5dadf8c307a2f7fe490c5c31d264649e0b8
fix conflicts
news/appinfo/version