Merge branch '1.0.x'
authorEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:32 +0000 (11:56 -0500)
committerEvan Prodromou <evan@status.net>
Wed, 16 Nov 2011 16:56:32 +0000 (11:56 -0500)
commit68676ad31da00f8b5bdade22eb3a07f52a3c976a
tree023f924138d8db4c34cfb9b50c38b22f7c3a1a94
parente2c65d72aebdedf5439f84833db9fcb63a81dd2b
parentb4ecb249070803b0600b2c1c100e80ca53e942ca
Merge branch '1.0.x'