[pLog-svn] r2757 (possible conflict: trackback.php)

[Jon Daley]

 	I am not sure if the last time I merged the 1.0.2 branch, the list 
was working.  I have the same comment again, so I will repeat it, because 
I don't think I heard an answer, I said:

------------------------------------------------------------------------
r2667 | jondaley | 2005-12-06 22:21:36 -0500 (Tue, 06 Dec 2005) | 1 line

merged 1.0.2 branch.  -r2539:2666.  Only one conflict that I am not sure 
about: trackback.php - looks like the file is purposely much simpler in 
the trunk, so pwestbro's change to the 1.0.2 is not needed??