Merge branch 'master' into sailfish-port
authorLuciano Montanaro <mikelima@cirulla.net>
Wed, 6 Nov 2013 22:00:19 +0000 (23:00 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Wed, 6 Nov 2013 22:00:51 +0000 (23:00 +0100)
commit839ac7f605f29d583fe2264c6933c0453aa1bc99
treeb00fff5fb9a368ab76d7b6509d409e4412f8df67
parentaf71756d8869d06f038be38707580407a46b6ec0
parente5db4833084ce54f45606658087f5615d526233a
Merge branch 'master' into sailfish-port