Merge commit 'git/master'
commit74bb0c78b691492b4867d691bedbbc0f01fa3b56
authorSam Hocevar <sam@zoy.org>
Sat, 21 Mar 2009 07:10:55 +0000 (21 08:10 +0100)
committerSam Hocevar <sam@zoy.org>
Sat, 21 Mar 2009 07:10:55 +0000 (21 08:10 +0100)
tree2aada5332ec4176c1f051545a2aa2dbc03d11754
parenta0b340648439bb844cda87b21c75b268a9164ba7
parenta797b02f3925c4a6324472e2edaf4a58d4ffc097
Merge commit 'git/master'
config.c