From: www-data Date: Sun, 30 Dec 2012 21:15:40 +0000 (-0500) Subject: Merge branch 'master' of /git/bmh-cv X-Git-Url: https://projects.mako.cc/source/bmh-cv/commitdiff_plain/48d406e608ed5ad4da978c99dfbb5059622d33a5?hp=99eefd0e1b779d8fca15f0fc234d79aee01b1d6b Merge branch 'master' of /git/bmh-cv --- diff --git a/bmh-cv.tex b/bmh-cv.tex index 882e94c..c32cd28 100644 --- a/bmh-cv.tex +++ b/bmh-cv.tex @@ -206,11 +206,11 @@ \subsection{Other Publications} \begin{cvlist} -\item 2011. Hill, Benjamin Mako. Freedom for Users, Not For Software. - In \emph{Life of the Commons: Another World Is Possible - Beyond Market} edited by Silke Helfrich and David Bollier, - Heinrich-Böll-Stiftung. (Published in German as - \emph{Commons: Für eine neue Politik Jenseits von Markt und Staat}) +\item 2012. Hill, Benjamin Mako. Freedom for Users, Not For Software. + In \emph{Wealth of the Commons: A World Beyond Market and State} + edited by David Bollier and Silke Helfrich, Levellers + Press. (Published in German as \emph{Commons: Für eine neue Politik + Jenseits von Markt und Staat} by Heinrich-Böll-Stiftung, 2011) \item 2010. Monroy-Hernández, Andrés and Benjamin Mako Hill. Cooperation and Attribution in an Online Community of Young Creators. In Computer Supported Coopreative Work 2010