Merge branch 'maint'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:28:39 +0000 (14:28 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 1 May 2012 12:28:39 +0000 (14:28 +0200)
commite2dd3ffbb403bd5611981404c3cdcf392deb34d1
tree442df3b56c3e73d14a35c51381b394ab29a99ec4
parent140ce85ed89d28f8130c6dcf471408823c268a33
parentf3f85d2ecfecd78b6346a613b9ef7da3bc173202
Merge branch 'maint'

* maint:
  fixup: botched edit in bootstrap.sh