ErikZalm/Marlin — pull request #1270 by Wurstnase (2014-12-29 23:53:18+00:00)
Title: Manage_inactivity expand in marlin.h

finally this should work. it works in the stable branch. i can't compile
the dev atm.