Merge branch 'next'

This commit is contained in:
John Wiegley 2009-10-31 05:34:51 -04:00
commit a2e643fc3d

View file

@ -1,5 +1,9 @@
#!/bin/sh
set -e
(cd plan/data; git push)
(cd plan; git commit -a -m "Update TODO files" && git push)
git checkout master
git merge --no-ff next
git checkout next