Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:27:17 +0000 (18:27 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:27:18 +0000 (18:27 +0100)
commit5173ee755e9d90c44b748f57090c0df8cf9a79df
tree508b3ed5ffa86f97109a2b9f5fec83028a687071
parent022d6294cb50c832d054408ea5429aaa2de0b55b
parent279fc6ce0d6b56a9336240a549118220c9c9388d
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ia6e9b1180bd3125a40bf7f244fbf4c9b0e9766a2