Permalink
Browse files

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

Conflicts:
	.idea/misc.xml
  • Loading branch information...
1 parent 79a106b commit ee154d73220a5fdc7a168f549dda2a6bcfc7cbf3 @pkasprzak pkasprzak committed Feb 21, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitignore
View
@@ -1,2 +1,3 @@
+.idea
tmp
log

0 comments on commit ee154d7

Please sign in to comment.