Merge remote-tracking branch 'origin/master' into gsocSagarRenewable_energy

Authored by scagarwal.

Description

Merge remote-tracking branch 'origin/master' into gsocSagarRenewable_energy

Merged Changes

CommitAuthorDetailsCommitted
773f07a4be48jjazeix
BUG:352640 remove extra line breaks + merge translatable strings 
Sep 13 2015
0504179461d7jjazeix
BUG:352598 hanoi_real, missing link to wikipedia at display 
Sep 13 2015
fc1236f79a79jjazeix
BUG:352638 Unable to return to main menu after abort download images 
Sep 13 2015
6f86b423d612hkaelberer
build: fix BuildTranslations with packaged Qt5 
Sep 13 2015