Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6d5333905fd7dd39a8fc4a0cb9243663e1006ec7 https://github.com/phpmyadmin/phpmyadmin/commit/6d5333905fd7dd39a8fc4a0cb924... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths: M libraries/operations.lib.php

Log Message: ----------- Separate copy type from rest of the options

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: cac2bc75b3a518ad8420e27535699c53e7c76b37 https://github.com/phpmyadmin/phpmyadmin/commit/cac2bc75b3a518ad8420e2753569... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths: M doc/setup.rst

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Commit: 91136ca8a61522edacfd7aa2c4ec8e0357f87aac https://github.com/phpmyadmin/phpmyadmin/commit/91136ca8a61522edacfd7aa2c4ec... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-04-29 (Wed, 29 Apr 2015)

Changed paths: M libraries/operations.lib.php

Log Message: ----------- Align

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7256d9ed597f...91136ca8a615