tree 33218f4ce00375b3c2a6a8a6fb2fb2cbdbd23e97
parent 46a1de68a663fd7af1a0a08124738cecc84fd5c7
parent 1420188b29b8454c9538040388319127d647ba9e
author Greg Aker <greg@gregaker.net> 1320993464 -0800
committer Greg Aker <greg@gregaker.net> 1320993464 -0800

Merge pull request #653 from mpmont/develop

Added the mime type for pptx.