Merge tag 'upstream/3.0.717'
authorEmil Mikulic <emikulic@gmail.com>
Sun, 18 Aug 2013 06:34:48 +0000 (16:34 +1000)
committerEmil Mikulic <emikulic@gmail.com>
Sun, 18 Aug 2013 06:34:48 +0000 (16:34 +1000)
commit53d9d497ad0dcb0c37efb23a5468762355db6512
treece4bee4de08cad18255538bf7e9c4b1f0a616ad0
parentb6069b5cedf32ffb61978dba984fba393be6038a
parent4da209d9116b41ab59eeedc5823bc2cb64b5bc3e
Merge tag 'upstream/3.0.717'

Upstream version 3.0.717