Commit 4fe5520a10eba1509d41daa4bacf3da9a8580d9b

nulltoken 2012-09-17T17:46:58

remote: remove some code duplication