Merge remote-tracking branch 'origin/master' into v4.7.x
authorArun Persaud <arun@nubati.net>
Fri, 8 Feb 2013 04:12:02 +0000 (20:12 -0800)
committerArun Persaud <arun@nubati.net>
Fri, 8 Feb 2013 04:12:02 +0000 (20:12 -0800)
commit15a3ab112c17105b792f756125f91ec18fe38d36
treee28b80bf917a86b5188608806a4f9a95504aca29
parent97fbebeb410d64f66811eb9dbee695eee7076b3d
parentb26b0121f5fae16ac114604a488a4b7afe89e5c9
Merge remote-tracking branch 'origin/master' into v4.7.x

Conflicts:
NEWS
NEWS