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

Trivial merge