Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor

This commit is contained in:
Kris McQueen 2010-08-11 17:53:44 -07:00
commit 06881fa28f

1
.gitignore vendored
View File

@ -1,4 +1,5 @@
build/build.number build/build.number
build/.project
bin bin
cloudstack-proprietary cloudstack-proprietary
.lock-wscript .lock-wscript