Merge commit 'bf6ea14e54acbda6bc45df5d1a7039533c6ce475'
authorLuca Filipozzi <lfilipoz@emyr.net>
Wed, 5 Mar 2014 10:34:59 +0000 (10:34 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Wed, 5 Mar 2014 10:34:59 +0000 (10:34 +0000)
1  2 
input/howto/new-machine.creole

Simple merge