projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6a9e6c2) | patch
fixing horrible terrible merge problem by reverting
authorJoshua Ferraro <jmf@liblime.com>
Fri, 19 Oct 2007 15:20:25 +0000 (10:20 -0500)
committerJoshua Ferraro <jmf@liblime.com>
Fri, 19 Oct 2007 15:21:16 +0000 (10:21 -0500)
commitd909e89dd4f83d7cc2661ea166aaa2b6ba09ec2c
tree78c9f0bb11f9d05677bc1905e5cc4001bbc3dc80tree | snapshot
parent6a9e6c2a4b0841b0fe2eb037ddc7f0dffd859f69commit | diff
fixing horrible terrible merge problem by reverting

to HDL's last commit

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
members/memberentry.pl [changed mode: 0755->0644] diff | blob | history
Main Koha release repository