From: Daniel Hokka Zakrisson Date: Tue, 14 Dec 2010 21:04:50 +0000 (-0500) Subject: Merge branch 'master' of dhozac@git.planet-lab.org:/git/bootmanager X-Git-Tag: bootmanager-5.0-16~20 X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=23382d6d7f912ec3340761d57e7cdc1d1b4f2f1a Merge branch 'master' of dhozac@git.planet-lab.org:/git/bootmanager --- 23382d6d7f912ec3340761d57e7cdc1d1b4f2f1a