Merge branch 'obs' into harmattan
authorHeli Hyvättinen <heli.hyvattinen@kymp.net>
Fri, 18 Nov 2011 21:27:24 +0000 (23:27 +0200)
committerHeli Hyvättinen <heli.hyvattinen@kymp.net>
Fri, 18 Nov 2011 21:27:24 +0000 (23:27 +0200)
commit57adc724d65049e69fbd2176dfc4ffaaba5e22c3
tree4cf7ab5877c40fcda694bd5205bd3411b2cc4f11
parent547cdd92ee63e7dfdb0b45ca8e005fd06a0e20b9
parent52430a2fdab589337abb8b8f7055521b6e3811e9
Merge branch 'obs' into harmattan

Conflicts:
qtc_packaging/debian_harmattan/control
qtc_packaging/debian_harmattan/control