61afe1449e
Conflicts: lib/rex/exploitation/cmdstager.rb Conflict was just the $Id$ tag, which is no longer used anyway.