Merge remote-tracking branch 'origin/stable' into dev
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:18:53 +0000 (18:18 +0100)
committerSergio Ahumada <sergio.ahumada@digia.com>
Fri, 8 Nov 2013 17:18:53 +0000 (18:18 +0100)
commitdc9952e2b360df9b271f54f207919a03268b12a9
tree1b978eee4be098f6022767915e167610b60a4a33
parent3111dcf7e5dd7638ae17be4a9e056b907fc6f7c9
parentb719b93770393bbf20251e1dffc70498061e612c
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I80d1a402dfb6f306748e65f056d4d50cb402ee02