]> git.cameronkatri.com Git - cgit.git/commit
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Sun, 7 Nov 2010 15:25:23 +0000 (16:25 +0100)
committerLars Hjemli <hjemli@gmail.com>
Sun, 7 Nov 2010 15:25:23 +0000 (16:25 +0100)
commit69f705cf5727cc1f099f6cd6af759f66bfd9a343
treeab36f62bc5fea3856603f6653f5c8da31233abea
parent5807fb79faa49e9a8f2da616e9cc821e0198fcb7
parentaabc70f74b8c334510774ecd508699c418f48a56
Merge branch 'stable'

Conflicts:
scan-tree.c

Signed-off-by: Lars Hjemli <hjemli@gmail.com>