Merge branch 'wip-MDL-35842-master' of git://github.com/phalacee/moodle

diff --cc blocks/glossary_random/block_glossary_random.php
index af9c550,b4bb0ec..8dfa97f
--- 1/blocks/glossary_random/block_glossary_random.php
--- 2/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@@ -3,9 -3,9 +3,10 @@@
  define('BGR_RANDOMLY',     '0');
  define('BGR_LASTMODIFIED', '1');
  define('BGR_NEXTONE',      '2');
+ define('BGR_NEXTALPHA',    '3');
  
  class block_glossary_random extends block_base {
 +
      function init() {
          $this->title = get_string('pluginname','block_glossary_random');
      }

diff --cc blocks/glossary_random/lang/en/block_glossary_random.php
Simple merge