Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:03 +0000 (14:33 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 6 Sep 2013 12:33:03 +0000 (14:33 +0200)
commitb4719a8cdeffc3991a63fed7df6489509173ebcd
treeae24bf79efddd0c6f98b589852b312e1c9f56ff5
parent34141be75385060aabc34bf92bffd7644b1c5dbb
parent25e4141213098e2358d6bfb3987195656f1b8064
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8352e99c9886882115b5808e6903ce09645949ba