Merge remote-tracking branch 'local_master/generic'
authorGit User <support@planet-lab.org>
Mon, 1 Dec 2014 15:06:03 +0000 (10:06 -0500)
committerGit User <support@planet-lab.org>
Mon, 1 Dec 2014 15:06:03 +0000 (10:06 -0500)
commit18b9b3591bd73925f8300e1e1eaea667cd7ac977
treec7172ac82071fa1458debeba186cf6861045c044
parent63cecc34d73c8b07ec508f994ad5ce87b46d67a8
parente015bdc8aa5010ccb6c0acdd9519bc0b09ce35d9
Merge remote-tracking branch 'local_master/generic'