Merge remote-tracking branch 'origin/next' into widgets
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Tue, 10 May 2011 20:12:41 +0000 (15:12 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Tue, 10 May 2011 20:12:41 +0000 (15:12 -0500)
commitc7dc51aabbeef7dca86024ba90f12b560494d6f7
treeffe0631bb1605c63fbda857a7e2a09f8edd1dd01
parent445c98a8ac7c643e16e0bb4f49ee9485908bb1b0
parentd6930e6c894e1d815c6b529d3985783196908f10
Merge remote-tracking branch 'origin/next' into widgets