From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Apr 2011 08:15:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'earl/nano'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26b8800618dc2daad975e88439d32ea276fbde08;p=ipfire-3.x.git

Merge remote-tracking branch 'earl/nano'
---

26b8800618dc2daad975e88439d32ea276fbde08