summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@gmail.com>2010-07-01 17:38:03 -0500
committerVishvananda Ishaya <vishvananda@gmail.com>2010-07-01 17:38:03 -0500
commitd40990eceecb0eae4906ad5c923b421d4f4c1075 (patch)
tree7b8c32802a29466938ea10f65219332b748828b9 /bin/stack
parent55def9c6b99514655330eb9c4d70fe09146ce36a (diff)
parentea9b913ccceda5944c881f3ce9cadde39b0e0344 (diff)
Merge remote branch 'nova/master'
Conflicts: docs/getting.started.rst
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions