| commit | 2d95e48d394480aa22596105c9ca469fb5c4c923 | [log] [tgz] |
|---|---|---|
| author | Siobhan Tully <stully@verivue.com> | Fri Sep 06 10:56:06 2013 -0400 |
| committer | Siobhan Tully <stully@verivue.com> | Fri Sep 06 10:56:06 2013 -0400 |
| tree | 296fb48eed62d8ca7ea376732e5f190c98d4267b | |
| parent | bfd11dcba19b93cf3cc4c074bf9d71547806d47d [diff] | |
| parent | d3d122ee1de0f509a2f559a40989de9a3dceeb3c [diff] |
Merge branch 'master' of git.planet-lab.org:/git/plstackapi Conflicts: planetstack/core/admin.py planetstack/planetstack/urls.py