Merge commit 'upstream/1.2.0'
authorAndres Mejia <mcitadel@gmail.com>
Sun, 8 Jan 2012 18:14:01 +0000 (13:14 -0500)
committerAndres Mejia <mcitadel@gmail.com>
Sun, 8 Jan 2012 18:14:01 +0000 (13:14 -0500)
commitea9082f2001b5b0e321cd44733343f021e2bc313
tree24f8d581684e2528e77d8e96628479aead94234d
parent375eb097658f12c4ba896cae6fe0c27ca0901c1d
parent5670ec6e746ac6d1f110e160806c8d846b98b660
Merge commit 'upstream/1.2.0'