Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  fix small js error when user not logged in
  install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect

* master:
This commit is contained in:
Simon L'nu 2012-05-24 19:30:41 -04:00
parent 5bc0cfa067
commit 25547cb21f

Diff Content Not Available