Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:06 +0000 (16:43 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 13 Sep 2013 14:43:06 +0000 (16:43 +0200)
commit7a8cab928dd405973e102ad2e6703cdbbb6bd505
treed090a99f81d9889dae9ef4984b438edc1d6767ec
parentb4719a8cdeffc3991a63fed7df6489509173ebcd
parent1f8aa220b50eb83205279441769fa697730b3e6f
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia10bb1e8b5fa8bb93e76bf2e295df5c10336e582