fnp / django-pagination.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3193626 0fbf41d)
Merge remote branch 'ericflo/master'
authorBrian Rosner <brosner@gmail.com>
Tue, 13 Apr 2010 00:13:12 +0000 (18:13 -0600)
committerBrian Rosner <brosner@gmail.com>
Tue, 13 Apr 2010 00:13:12 +0000 (18:13 -0600)

Trivial merge