Merge branch 'harmattan-port'
authorLuciano Montanaro <mikelima@cirulla.net>
Tue, 27 Dec 2011 22:51:11 +0000 (23:51 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Tue, 27 Dec 2011 22:51:11 +0000 (23:51 +0100)
commit60e94fd6f9c652d21d8aa892b2aaeb7f2de29df5
tree126cddb8438085471c2b711a3df1a7ee6a1a459d
parent1c1893a32f63ac780b1877d3db2c9ff830b59873
parenta14e76318d4f5f7df5de7d4196c1e9d622bc12d0
Merge branch 'harmattan-port'
of ssh://drop.maemo.org/git/quandoparte into harmattan-port

Conflicts:
application/resources/stations/stations.qpl
application/resources/stations/stations.qpl