osdc/osdconf-website — pull request #9 by AALEKH (2013-10-14 11:23:57+00:00)
Title: Merge pull request #1 from osdc/master

merge