Merge remote branch 'melinath/master'
authorHarris Lapiroff <hlapirof@oberlin.edu>
Wed, 2 Mar 2011 19:59:25 +0000 (14:59 -0500)
committerHarris Lapiroff <hlapirof@oberlin.edu>
Wed, 2 Mar 2011 19:59:25 +0000 (14:59 -0500)
commitb8668727caf6da1e8425fd32334a4ec5919ce4a2
tree43b35f60e1de98bdbcfab16c20149b85beafc20f
parent77f783071cd3c6246a90dc6aa869b4efe7610379
parenta85e27d82d1a7b6e49fa2e16f0bbd902344def25
Merge remote branch 'melinath/master'
contrib/shipherd/templatetags/shipherd.py