Merge branch 'master' of git://git.pipapo.org/webgit
authorCillian de Roiste <cillian.deroiste@gmail.com>
Sun, 20 Jan 2008 22:40:09 +0000 (22:40 +0000)
committerCillian de Roiste <cillian.deroiste@gmail.com>
Sun, 20 Jan 2008 22:40:09 +0000 (22:40 +0000)
1  2 
src/actions.c
src/webgit.c

diff --cc src/actions.c
Simple merge
diff --cc src/webgit.c
Simple merge