Merge pull request #1830 from wright/alphabetizeMagics

Change lsmagic to list magics in alphabetical order.

IPython/core/magics/basic.py

@@ -46,10 +46,10 b' class BasicMagics(Magics):'
         mman = self.shell.magics_manager
         magics = mman.lsmagic()
         out = ['Available line magics:',
-               mesc + ('  '+mesc).join(magics['line']),
+               mesc + ('  '+mesc).join(sorted(magics['line'])),
                '',
                'Available cell magics:',
-               cesc + ('  '+cesc).join(magics['cell']),
+               cesc + ('  '+cesc).join(sorted(magics['cell'])),
                '',
                mman.auto_status()]
         return '\n'.join(out)