Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface
authorsmbaker <smbaker@fc8clean.lan>
Thu, 12 Jan 2012 20:27:00 +0000 (12:27 -0800)
committersmbaker <smbaker@fc8clean.lan>
Thu, 12 Jan 2012 20:27:00 +0000 (12:27 -0800)
commitc27cbd1c037ce1f16caa0e43f58794bb1250e6e7
tree5c411be2b34e201b12f4a4c772996ed4cc80381b
parentaa388923ed3dd6bbf8e5b14d52a613c4f374da7a
parent58eebb2acd0c5ba0e083166e6e2d3449b83a9ec1
Merge branch 'master' of ssh://bakers@git.planet-lab.org/git/sface