Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:18 +0000 (13:15 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 23 May 2013 11:15:18 +0000 (13:15 +0200)
commit5795eaf936ca43306c3bcaf53cf943de01fa796f
tree0fde6a3190c619fe1ad6791839a5e8078403e9b5
parent622d82bdec5a15a039a65e33027ebdeae0fd6d65
parent6caf497f60559c991929036d4de878759e0e3d08
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I3c7f5f8fa60f24c97060f88b49a76d712e75facd