Merge tag 'upstream/1.3.0'
authorAndres Mejia <amejia004@gmail.com>
Sat, 5 May 2012 19:24:31 +0000 (15:24 -0400)
committerAndres Mejia <amejia004@gmail.com>
Sat, 5 May 2012 19:24:31 +0000 (15:24 -0400)
commit2eb4746ca71c4e3139dda3972ff8efb49fd4d823
treef0206fc41ae11feb9943e11975123b8163ae56be
parentc1f2a3d1b85541ed05df6482735def11c37c8f72
parentfab61e3d0384e61553b39860b923d41bc0cf17b1
Merge tag 'upstream/1.3.0'

Upstream version 1.3.0