What is Inflation?

Is it an increase in the money supply or an increase in the general level of prices? This article from Mises.org today looks into this question.