Initial import of user auth via filtered aliases
Renaming the generate script and fixing a typo in the comments
Removing old script
Renaming the directory
Adding the kibana-int-user code and cleaning things up
Fixing proxied spelling
Merge pull request #1 from elasticsearch/master

2-12
The build @REV@ replacement task was breaking comment lines starting with // and containing @REV@
Merge branch 'master' of https://github.com/TropiaN/kibana
spelling correction for "uncluttered" in sparklines/module.js
Merge pull request #908 from ccowan/master

Sample files for Restricting Users via Filtered Aliases
Merge pull request #955 from bleskes/fix/rev_replacing

The build @REV@ replacement task was breaking comment lines starting with // and containing @REV@
Merge pull request #961 from FestivalBobcats/master

Spelling correction for "uncluttered" in sparklines/module.js
Closing the astrick security hole
Merge pull request #965 from ccowan/master

Closing the asterisk security hole in filtered users example.
Merge remote-tracking branch 'upstream/master'