Ny linje#14

Open

lottej wants to merge 8 commits intobodil:masterfrom

Commits on Sep 4, 2012

change header

Johansen
authored and
Johansen
committed
changed header again

Johansen
authored and
Johansen
committed
mend

Johansen
authored and
Johansen
committed
Merge branch 'master' of https://github.com/lottej/hello-git

Johansen
authored and
Johansen
committed
change to branch

Johansen
authored and
Johansen
committed
my friend header

Johansen
authored and
Johansen
committed
merge conflict

Johansen
authored and
Johansen
committed
new line

Johansen
authored and
Johansen
committed