Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:34:19 +0000 (14:34 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:34:19 +0000 (14:34 +0200)
commit6d6dcaf5e4bb3a14b943e77a258f422f0270074b
treee56144f5f7f39c6e70b73351ad484b96b340d301
parentf9c0948343efdaf04be7a97546964ea4987b74d0
parent409655f3451815930b70a71baa175ab9f34467ed
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I29e25aef95a7b845bfe7d57d41369fec2f1fd562