Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:32 +0000 (18:31 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 10 Jan 2014 17:31:32 +0000 (18:31 +0100)
commit7ebe6263c14ad517c73d0c082fc3e962364b8757
tree6863e13476b172249764e5b3a74660756e4e7c1a
parent224194151ccde2b255ba24e14855b2fa497f1952
parent62c8144782b380407c87d0f75a0f7f7df3847035
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I1acc7b8d54e8db1a3bec01c31c755032d24e8e64