Merge remote-tracking branch 'origin/5.0' into bootmanager-vender bootmanager-vender
authorGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:17:39 +0000 (03:17 -0400)
committerGit User <support@planet-lab.org>
Tue, 14 Oct 2014 07:17:39 +0000 (03:17 -0400)
commit7cd82eb93512460e8dd748f9737648aabf05f70d
tree652b9894857527832951bd907e8a26f55cb1e2da
parent0ead051299a3094173442795ee262b0900a71ecd
parent29a16e5a87cc0290295b86bc1ebf3081ac10a9c9
Merge remote-tracking branch 'origin/5.0' into bootmanager-vender