Merge branch 'master' into config
commitafd18ed593ef3ec58c0c351f9e49fb2b06b3d223
authorDag Odenhall <dag.odenhall@gmail.com>
Sat, 26 Apr 2008 13:36:22 +0000 (26 15:36 +0200)
committerDag Odenhall <dag.odenhall@gmail.com>
Sat, 26 Apr 2008 13:36:22 +0000 (26 15:36 +0200)
tree448ab35fce2d114337e77ead71c3816e51ca64e1
parent1663e9af380ed254c79434b3cd02a1596e722399
parent8e4ddfe320f58e042df5b757295b1b73cdf09365
Merge branch 'master' into config