Merge remote-tracking branch 'origin/5.4' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:49:54 +0000 (17:49 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Thu, 28 Aug 2014 15:49:54 +0000 (17:49 +0200)
commit9267a7833c6c30ccd4cbda3d087f0f901fb462eb
treed3ce3857dbd51259eb5dbf90bbb0c58917add15f
parent5b3292a14e0c860fc99e0795bb30cc161e934e41
parent80ba1d635dc37963b4c90d776c46774b0349c4f8
Merge remote-tracking branch 'origin/5.4' into dev

Change-Id: Ib2ef516ab5f5dab86b73fdca5503048e87840280
src/plugins/resourcepolicy/resourcepolicyint.cpp