Merge branch 'master' into ffos_privileged_compatible
authorPiotr Zalewa <piotr@zalewa.info>
Mon, 19 May 2014 12:38:50 +0000 (14:38 +0200)
committerPiotr Zalewa <piotr@zalewa.info>
Mon, 19 May 2014 12:38:50 +0000 (14:38 +0200)
commit5570976581ec6983d11ba498453788ad9f205c4f
treed34196e4faf6565450297a715312946845634ec0
parent0de5e956d2f677d5ea770bb97ae6b9a1ed10c33b
parentb0ef368c4c95ec7990e5d551185a8cdaf491bded
Merge branch 'master' into ffos_privileged_compatible