Merge remote-tracking branch 'mainline/2.6' into mer
authorAlessandro Portale <alessandro.portale@digia.com>
Tue, 6 Nov 2012 17:41:07 +0000 (18:41 +0100)
committerAlessandro Portale <alessandro.portale@digia.com>
Tue, 6 Nov 2012 17:41:07 +0000 (18:41 +0100)
commit7461b27dad1c7336cc8bc14698412f557886ae3b
treeea7a31a2e333a54baa160c2b7c8eb70ceeb73b61
parentc4c09a00cedd75d295d00908ac60dc6ce986f59e
parent4e49c297bc000b5221f811f1945723f0931310da
Merge remote-tracking branch 'mainline/2.6' into mer