oscarleiva/energylink

Torkel Ödegaard dda1cf1a88 Merge branch 'ace-editor'		%!s(int64=8) %!d(string=hai) anos
..
annotations.editor.html	a8ac215039 Add a few more MySQL macros:	%!s(int64=8) %!d(string=hai) anos
config.html	649122b4fb mysqlds: add placeholder/typeahead for localhost connection strings	%!s(int64=8) %!d(string=hai) anos
query.editor.html	80f5c914e8 ace: removed the old text areas	%!s(int64=8) %!d(string=hai) anos