SuperAmerica/agilefant — pull request #22 by jebaldwin (2012-03-19 04:57:13+00:00)
Title: Somehow did it again

We have a lot of old junk in our pull request again. What I did last time was reset to superamerica and pushed that to our repository, perhaps that is not the way to do it?

The commits for this time are from 76f54558 to 406b0dbd.

There are also previous commits from us merging a branch in, and then also just the merge commit, the ones from before are in the last sprint, so commit d475696917 does that merge. I hope that works. I'm not sure if I needed to include every commit that was before on that branch. The only file that mattered on that branch is src/fi/hut/soberit/agilefant/readonly/ReadonlyFilter.java. The rest have been changed so significantly that the newest commits cover them. But that file was created in that branch.