Merge "Removed the .iml files and updated .gitignore"
authorBrent Salisbury <brent.salisbury@gmail.com>
Tue, 23 Jul 2013 16:44:27 +0000 (16:44 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 23 Jul 2013 16:44:27 +0000 (16:44 +0000)

Trivial merge