Merge branch 'master' of ssh://git.opennebula.org/ogf-occi

Conflicts: .idea/misc.xml
gwdg · Feb 21, 2012 · ee154d7 · ee154d7
1 parent 79a106b
commit ee154d7
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+.idea
 tmp
 log