[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 6b81b3: align

[Madhura Jayaratne]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 6b81b3925df35075dd8f11f3c1efb9201a534339
      https://github.com/phpmyadmin/phpmyadmin/commit/6b81b3925df35075dd8f11f3c1efb9201a534339
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M libraries/plugins/IOTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/CodeMirrorEditorTransformationPlugin.class.php
    M libraries/plugins/transformations/abstract/ImageUploadTransformationsPlugin.class.php
    M libraries/plugins/transformations/abstract/TextFileUploadTransformationsPlugin.class.php
    M libraries/plugins/transformations/input/Text_Plain_IPToBinary.class.php

  Log Message:
  -----------
  align

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


  Commit: 608c9f198ed18a6ba71fb5395026e2cf6f5e7d33
      https://github.com/phpmyadmin/phpmyadmin/commit/608c9f198ed18a6ba71fb5395026e2cf6f5e7d33
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M po/sq.po

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


  Commit: f344c261384771a5df592dacf43f120022a5246a
      https://github.com/phpmyadmin/phpmyadmin/commit/f344c261384771a5df592dacf43f120022a5246a
  Author: Madhura Jayaratne <madhura.cj at gmail.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M test/classes/plugin/transformations/Transformation_Plugins_test.php
    M test/libraries/PMA_transformation_test.php

  Log Message:
  -----------
  Fix tests

Signed-off-by: Madhura Jayaratne <madhura.cj at gmail.com>


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/c5b7411f3f11...f344c2613847