Merge remote branch 'origin/badges-index-fix' into next
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 2 Nov 2010 00:17:55 +0000 (19:17 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 2 Nov 2010 00:17:55 +0000 (19:17 -0500)
commit9d9853d2dcab853993fc1a35a12d9b6bb1acf4de
treeaf68ca997f5ff33ce853bbc8874b885a1d96023f
parent7ef87429318d5edb9aa108247b477c1448ae9260
parentc3c7a1a747356776e7c47a5a12a15ca49122475b
Merge remote branch 'origin/badges-index-fix' into next