Merge remote-tracking branch 'origin/release' into stable
authorSergio Ahumada <sahumada@blackberry.com>
Sat, 15 Mar 2014 18:14:50 +0000 (19:14 +0100)
committerSergio Ahumada <sahumada@blackberry.com>
Sat, 15 Mar 2014 18:15:21 +0000 (19:15 +0100)
commitb6a3ee88194f0e6257e5f9d0bd5e5c5139fb0b95
treed954143f8003bf9d5e4432c492ec79b738b4ba05
parent6af4cc3b24c3da99153e63258de4d595c9a7e3b7
parentaee39ea4a7171d8c42fae46d6e7cfd6938637f30
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I7a8323c935945c69e8a9ea4de0d382641c320e18