Alec Leamas d3a6031f88 Merge remote branch 'upstream/master' into port-test

2010-10-13 12:47:49 +02:00

..

fedora

Resolving merge conflict... My bad, apologies

2010-10-13 10:23:06 +02:00

ubuntu

Merge remote branch 'upstream/master' into port-test

2010-10-13 12:47:49 +02:00

bootstrap-fedora-diaspora.sh

Move install scripts to /pkg

2010-10-07 16:06:59 -07:00

ubuntu-setup.bash

Add or later to license notice

2010-10-07 16:25:34 -07:00