Permalink
Browse files

Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/resources/projects/project-001/pom.xml
  • Loading branch information...
2 parents a56e0ee + b9ef9b6 commit a2a234aabcec0754e380f6a62e7ab7a11c11f667 @sirrapa committed Dec 18, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit a2a234a

Please sign in to comment.