Merge branch 'master' of https://github.com/jfding/mic
authorMarko Saukko <marko.saukko@cybercom.com>
Fri, 16 Dec 2011 07:24:46 +0000 (09:24 +0200)
committerMarko Saukko <marko.saukko@cybercom.com>
Fri, 16 Dec 2011 07:24:46 +0000 (09:24 +0200)
commit9a40deb87fd49269cc696ef3e95ff440c142f510
tree28669d894d422724586e944c79218cc16202de7d
parentec03ff608750a5f1e50bcc82f72289187a1dfdc6
parentabc86d9b3ac0bac273a05c6e9eed1447794d2000
Merge branch 'master' of https://github.com/jfding/mic

Conflicts:
distfiles/mic.conf
distfiles/mic.conf
mic/imager/baseimager.py