Merge remote-tracking branch 'local_master/generic' flab 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)

Trivial merge