Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Tue, 24 Sep 2013 16:27:54 +0000 (18:27 +0200)
committerSergio Ahumada <sergio.ahumada@digia.com>
Tue, 24 Sep 2013 16:27:54 +0000 (18:27 +0200)
commite4f68a2f2fd6594eec79b207776f056653783fbb
tree0af1bb103b250f8349d8fee64db72b49995c6c47
parente925560b37e148b468c2dcc5d6f163eb539df3e9
parente7a51b138772cb453555d27f44e6a2c0e79e799c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I580d8758366a6d225391b4bb7a2a3d37c8dca196