Merge branch 'master' of github.com:noqqe/bash-it
authorFlorian Baumann <flo@noqqe.de>
Mon, 22 Nov 2010 10:41:45 +0000 (11:41 +0100)
committerFlorian Baumann <flo@noqqe.de>
Mon, 22 Nov 2010 10:41:45 +0000 (11:41 +0100)

Trivial merge