Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 17 Jan 2013 17:23:27 +0000 (18:23 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 17 Jan 2013 17:23:52 +0000 (18:23 +0100)
commit0bd009dfadb2e2187b29ebd27a6e6fdf8ff89c66
tree153b66e48df75f54330cfb01a37c4419972b28b1
parent04a49468fda65936c0b6b349266bf029d8041212
parent1444a08b7e16a09f056f3bed24cf843d29874cba
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
sync.profile

Change-Id: Idd8799885298e5fcef5ecc2c40bf0688fa6aa995