Merge branch 'jeff' into 0.7.x
authorZach Copley <zach@controlyourself.ca>
Tue, 30 Jun 2009 23:41:17 +0000 (16:41 -0700)
committerZach Copley <zach@controlyourself.ca>
Tue, 30 Jun 2009 23:41:17 +0000 (16:41 -0700)
commite36a0fd619010c1c6dbf0c1d56c20675ed78d33e
tree698fc3714805e4511f87b4f864973cbd0bacc2bf
parent203a5aba67c3bd9e2848d90b1778240b387aeda3
parent10d4191bd103d177734ce4cf8006cd7af88e139b
Merge branch 'jeff' into 0.7.x

* jeff:
  Add site-wide option to change the length at which URLs are auto-shortened