adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,717 Commits 2 Branches 0 Tags 19 MiB
6908827035
Commit Graph

1425 Commits

Author SHA1 Message Date
Trevor Strieber
8355233f7f Fixing typo. 2014-05-24 08:35:54 +02:00
ncanceill
2c19c0e59e typo, fixes #1806 2014-05-24 08:31:59 +02:00
Robby Russell
3913106b2e Merge pull request #2787 from irnnr/plugin-vagrant 
Support new Vagrant commands
 2014-05-16 09:33:23 -07:00
Ingo Renner
8ed8005102 Improve consistency, remove dots at end of command descriptions 2014-05-15 12:26:39 -07:00
Ingo Renner
30d9952b62 [FEATURE] Support vagrant global-status 
Vagrant 1.6 introduced the `global-status` command which allows
to get a quick overview of all active Vagrant environments for the
currently logged in user.
 2014-05-06 10:53:12 -07:00
Ingo Renner
7f8ee9aabe [FEATURE] Support Vagrant Cloud commands 
Vagrant 1.5 added Vagrant Cloud to share boxes. Some boxes
may be protected, the `login` command allows to access those
protected boxes from Vagrant Cloud.
 2014-05-06 10:48:49 -07:00
Ingo Renner
38fe100efe [FEATURE] Support Vagrant Share 
Vagrant 1.5 introduced Vagrant Share to allow remote access to a Vagrant
environment. This adds support for the `share` and `connect` commands.
 2014-05-06 10:46:55 -07:00
Ingo Renner
236c8de7f3 [FEATURE] Support Vagrant 1.6 version command 
Vagrant 1.6 introduces a couple new commands, including the `version` command.
The `version` command shows the currently installed version information and
also checks for new updates available.
 2014-05-06 10:45:26 -07:00
Nicolas Brousse
73bf940c34 Update brew.plugin.zsh 2014-04-23 19:44:59 +02:00
Robby Russell
eafd5f3252 Merge pull request #1635 from jimhester/per-directory-history 
Update to latest per-directory-history
 2014-04-19 12:56:21 -07:00
Robby Russell
11bf1a3a29 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin 
Various fixes on zsh_reload plugin
 2014-04-19 12:55:56 -07:00
Robby Russell
4509228c53 Merge pull request #2728 from benwong/patch-2 
Spelling correction in itunes control function.
 2014-04-19 12:55:30 -07:00
Robby Russell
5eb5f7138a Merge pull request #2511 from FloFra/master 
Makes history-substring-search use term specific up and down buttons.
 2014-04-19 12:54:10 -07:00
Robby Russell
ee31abfb2d Merge pull request #2729 from grodzik/master 
Fix for Python3
 2014-04-19 07:15:04 -07:00
Javier Tejero
7949a1cd8d Fix docker rmi tab completion 
This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
 2014-04-19 09:03:28 +02:00
Paweł Tomak
cee52283d8 Fix for Python3 
In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
 2014-04-18 23:09:38 +02:00
Marc Cornellà
fcfa323974 Use cache folder inside $ZSH, delete with unaliased rm 2014-04-18 17:07:23 +02:00
Benjamin Wong
6f3cf195c6 Spelling correction in itunes control function. 
Spelling correction in itunes control function.
 2014-04-18 22:43:23 +10:00
DeLynn Berry
7d696f79b8 Remove mailcatcher 
The mailcatcher gem does not work correctly when executed through Bundler.
 2014-04-04 08:11:11 -06:00
Robby Russell
00d6ef8a31 Merge pull request #2329 from pstadler/brew-cask 
add brew-cask plugin
 2014-03-31 07:57:25 -07:00
Stanislav Schultz
b2ea7d3ec1 Add Ruby 2.1.1 support to rvm plugin 2014-03-28 20:25:13 +03:00
Robby Russell
70dfb91b98 Merge pull request #2663 from bobmaerten/docker-autocomplete-updates 
Docker autocomplete plugin is not up to date with recent versions.
 2014-03-27 21:33:49 -07:00
Robby Russell
fe73f8d5b1 Merge pull request #2651 from jehrhardt/fix-emacs 
Fix Emacs plugin
 2014-03-27 21:32:58 -07:00
Robby Russell
ae0c6507e4 Merge pull request #2659 from simonc/allowing-pow-path-with-spaces 
Allowing path with spaces in pow plugin
 2014-03-27 21:30:38 -07:00
Robby Russell
861d380aa3 Merge pull request #2658 from leifcr/rake-fast-issue 
Plugin: Rake-fast: Support both *nix and Darwin
 2014-03-27 21:29:36 -07:00
Robby Russell
27c28a94af Merge pull request #2647 from bobwilliams/master 
Adding a README.md for plugins/jsontools
 2014-03-27 21:22:03 -07:00
Robby Russell
78967b604d Merge pull request #2656 from philenotfound/master 
New aliases for 'apt-get' and 'aptitude' as they were overwritten by lat...
 2014-03-27 21:21:24 -07:00
Bob Williams
400643ff5b adding urldecode_json to compliment urlencode_json and updating readme.md; slight tweak to urlencode_json from previous commit 2014-03-27 10:34:54 -04:00
Bob Williams
0605d53fa7 adding urlencode_json and associated README.md details 2014-03-26 18:47:57 -04:00
Bob Maerten
76e1edf31f Matching autocomplete for Docker v0.9.1 
Many deprecations since 0.8 and new commands.
 2014-03-26 10:40:46 +01:00
Bob Williams
982b534ce8 adding the is_json tool and associated readme.md details 2014-03-25 16:20:25 -04:00
Kevin Bongart
7b08f494e3 Add README file to rake-fast plugin 2014-03-25 12:38:02 -04:00
Simon Courtois
015b742153 Allowing path with spaces in pow plugin 
This commit allows for paths with spaces to be symlinked
in Pow.

If an application is located in a folder like `/some path/to the/app`
the powit command would fail when it shouldn't. It's not the case
anymore.
 2014-03-25 17:16:20 +01:00
Patrick Stadler
9eadaf562a brew-cask plugin: use spaces instead of tabs 2014-03-25 16:56:09 +01:00
Phil Eichinger
44467877a8 New aliases for 'apt-get' and 'aptitude' as they were overwritten by later aliases 2014-03-25 16:47:58 +01:00
Bob Williams
64bb1a255a adding support for node 2014-03-25 16:47:58 +01:00
Bob Williams
a3b357abd8 Adds command line aliases useful for dealing with JSON 2014-03-25 16:47:58 +01:00
cybozuty
c1ada7a938 Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details. 2014-03-25 16:47:58 +01:00
fred-o
8194aa9554 application completion 2014-03-25 16:47:58 +01:00
fred-o
bc02c28b73 library completion 2014-03-25 16:47:58 +01:00
fred-o
0f32083163 in hindsight, this is probably a bad idea 2014-03-25 16:47:58 +01:00
fred-o
ee3a20a3dc completion of targets 2014-03-25 16:47:58 +01:00
fred-o
fd3d5bfb74 instance and cluster completion 2014-03-25 16:47:58 +01:00
fred-o
6d7d131a3c node completion 2014-03-25 16:47:58 +01:00
fred-o
f88b6bdc51 help command, node completion 2014-03-25 16:47:58 +01:00
fred-o
95f83193da added _files values for certain options 2014-03-25 16:47:58 +01:00
fred-o
9b4cf96ac0 completion options 2014-03-25 16:47:57 +01:00
fred-o
f644d2eb6f added alias 2014-03-25 16:47:57 +01:00
fred-o
4dcdd13009 added completions for all known arguments to all known commands 2014-03-25 16:47:57 +01:00
fred-o
7daf2f4a62 apparently, this file must exist for the plugin to load 2014-03-25 16:47:57 +01:00
fred-o
1988958a1f added completion for all asadmin subcommands 2014-03-25 16:47:57 +01:00
William Roe
7a94b76019 Add completion for pip install -r - so that it autocompletes requirements filenames 2014-03-25 16:47:57 +01:00
Derek Wyatt
ee8f9eebb5 Added an <esc> to the begining of everything. I ran something when I was in insert mode once and all it did was shove !args... into the buffer. <esc> first. 2014-03-25 16:47:57 +01:00
Derek Wyatt
46c2af396a Updated the README to include documentation on the postCallVim callout 2014-03-25 16:47:57 +01:00
Derek Wyatt
5a81fda42a Added an optional callout to the end of the interaction function. I put it in to allow me to put the window focus on MacVim / GVim depending on the different OS I happen to be on 2014-03-25 16:47:57 +01:00
Derek Wyatt
83071a10e7 Fixed: If you callvim on a non-existant file with a relative path, the CWD of the running gvim process is used, and that's not right. We use the PWD explicitly instead, in this case 2014-03-25 16:47:57 +01:00
Derek Wyatt
cdea478f0f A plugin that makes it easier to interact with the (single) running instance of gvim 2014-03-25 16:47:57 +01:00
cmar
8d1fa09007 command to restart pow process 2014-03-25 16:47:57 +01:00
cmar
640e5da688 added powed command to list pow urls 2014-03-25 16:47:57 +01:00
David Lee
95ffb167a1 Add gem build autocompletion 2014-03-25 16:47:57 +01:00
Leif Ringstad
48f8f2809b Plugin: Rake-fast: Support both *nix and Darwin 2014-03-25 16:36:39 +01:00
Florian Franzen
5303793ef1 history-substring-search: bindkey now checks if terminfo is available first. 2014-03-24 22:32:56 +01:00
Bob Williams
64c3ce35e1 adding xargs -0 to node aliases 2014-03-24 14:24:00 -04:00
Bob Williams
f8890f5646 updated readme.md and using tab char for formatting with node 2014-03-24 14:09:57 -04:00
Bob Williams
8db3e6329d bug fix for node pp_json version 2014-03-24 13:36:26 -04:00
Jan Ehrhardt
c451ff4bf3 Add check for display list equals nil 
Emacs returns either a sequence of availbale displays or nil. Checking
nil fixes this script to work as expected.
 2014-03-24 12:10:18 +01:00
Bob Williams
1fc40c60b5 updating README.md 2014-03-23 15:13:41 -04:00
Bob Williams
3bae9dd2bf adding README.md for jsontools 2014-03-23 15:12:18 -04:00
Bob Williams
d70e732944 Merge remote-tracking branch 'upstream/master' 2014-03-22 21:24:52 -04:00
Robby Russell
178b5224e8 Merge pull request #1302 from cybozuty/master 
Vagrant plugin: Rendering the 'vagrant box (remove|repackage)' completion code independant of Vagrant implementation details.
 2014-03-22 16:22:34 -07:00
Robby Russell
c4727ab558 Merge pull request #1262 from fred-o/glassfish-plugin 
Glassfish plugin
 2014-03-22 16:19:37 -07:00
Robby Russell
5540daf4a2 Merge pull request #967 from wjlroe/pip-requirements 
Add completion for pip install -r - so that it autocompletes requirement...
 2014-03-22 15:55:44 -07:00
Robby Russell
75504364ed Merge pull request #1022 from derekwyatt/master 
A plugin that makes it easier to interact with the (single) running instance of gvim
 2014-03-22 15:44:11 -07:00
Robby Russell
ae1f331782 Merge pull request #1005 from cmar/powed 
pow plugin - commands to restart pow and list urls
 2014-03-22 15:41:46 -07:00
Robby Russell
d4e907bf14 Merge pull request #973 from dlee/gem_build 
Add gem build autocompletion
 2014-03-22 15:36:52 -07:00
Robby Russell
d41c588d1b Merge pull request #672 from eMxyzptlk/zsh_reload 
Add zsh_reload which provides src function, this function will source .zshrc and rebuilds cache
 2014-03-22 13:56:03 -07:00
Robby Russell
d8a5fff1a7 Merge pull request #662 from walle/add_autocomplete_for_gas 
Update the script to account for the changes in 0.1.7 where .gas is a dir
 2014-03-22 13:55:33 -07:00
Robby Russell
319aafce8b Merge pull request #2618 from bdubertret/fix-gwip-norm 
Fix gwip alias in git plugin when no files to rm
 2014-03-22 13:36:27 -07:00
Robby Russell
73fd0669c0 Merge pull request #2638 from miguelfrde/irb 
Add irb to the list of bundled commands
 2014-03-22 13:32:19 -07:00
Robby Russell
d9683974fe Merge pull request #2605 from mhauserr/patch-1 
Added v as a keybinding to edit-command-line in vi-mode
 2014-03-22 13:30:16 -07:00
Robby Russell
123510382d Merge pull request #2615 from erbridge/fix_virtualenvwrapper_lazy 
Don't lazy load the virtualenvwrapper
 2014-03-22 13:28:30 -07:00
Robby Russell
c97aff8f6b Merge pull request #2616 from Bounga/master 
Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv
 2014-03-22 13:27:56 -07:00
Robby Russell
e0e4c0eeaf Merge pull request #2620 from reedriley/master 
Fixed errors if acpitool isn't installed on linux
 2014-03-22 13:27:28 -07:00
Miguel Flores Ruiz de Eguino
610655e827 Sort bundled commands alphabetically 2014-03-22 10:24:58 -06:00
Robby Russell
2403b05613 Merge pull request #2440 from m0nah/master 
Add Laravel4 plugin
 2014-03-22 07:57:14 -07:00
Robby Russell
e7420736db Merge pull request #2510 from pavoljuhas/master 
Add scd plugin for smart change of directory.
 2014-03-22 07:56:35 -07:00
Robby Russell
2e06412ee0 Merge pull request #2531 from KevinBongart/rake-fast 
Add rake-fast plugin for fast rake autocompletion
 2014-03-22 07:53:36 -07:00
Robby Russell
6d616de6f1 Merge pull request #2637 from aforty/master 
Atom plugin
 2014-03-22 07:52:24 -07:00
Robby Russell
184e93cb05 Merge pull request #2627 from loxley/add_knife_vault_cmd 
Add chef-vault knife cmd support
 2014-03-22 07:47:39 -07:00
Robby Russell
c98883f5be Merge pull request #2631 from AntoineD/master 
Fix dirpersist plugin
 2014-03-22 07:47:18 -07:00
jieryn
1509ac9a04 add common video formats FLV and WEBM 2014-03-22 08:51:26 -04:00
Miguel Flores Ruiz de Eguino
c3150edad2 Add irb to the list of bundled commands 2014-03-21 19:18:29 -06:00
Kevin Bongart
6a8f83bc50 Add new brew cask commands 2014-03-21 14:02:26 -04:00
Arno Fortelny
5f31190ab9 atom plugin 2014-03-21 11:49:52 -04:00
Antoine Dechaume
ef343eef30 Fix dirpersist plugin 
This plugin did not work, I just found the same functionnality in grml, this one works.
 2014-03-20 10:43:33 +01:00
Reed Riley
fb2d6eb567 Fixed errors if acpitool isn't installed on linux 2014-03-18 14:13:54 -04:00
Johan Svensson
645fceb38b Add chef-vault knife cmd support 2014-03-18 10:52:25 +01:00
Pavol Juhas
c1c107cfb9 Add scd plugin for smart change of directory. 
Synced with the scd-tracker branch
pavoljuhas/oh-my-zsh@2f78243cad.
 2014-03-17 19:49:12 -04:00
Pavol Juhas
6952105bfe Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2014-03-17 19:48:10 -04:00
Benoit Dubertret
a869ec9bc8 Fix gwip alias in git plugin when no files to rm 2014-03-17 16:07:46 +01:00
Bob Williams
5a586670d7 Merge remote-tracking branch 'upstream/master' 2014-03-17 09:32:57 -04:00
Nicolas Cavigneaux
baf2ab1bf1 Don't set RBENV_ROOT to "$HOME/.rbenv" when using Homebrew rbenv 
Hard setting RBENV_ROOT to "$HOME/.rbenv" when using Homebrew's rbenv
will breaks it. It has to be set to $(brew --prefix rbenv).
 2014-03-17 10:05:56 +01:00
Robby Russell
ca90021630 Merge pull request #2576 from jeffwilliams/master 
Added dirhistory plugin.
 2014-03-16 20:49:30 -07:00
Robby Russell
81d53af971 Merge pull request #2597 from githubhjs/master 
List pkgs by size
 2014-03-16 20:45:18 -07:00
Felix Laurie von Massenbach
3be2e34d96 Don't lazy load the virtualenvwrapper. 
Fix robbyrussell#2355.
 2014-03-17 02:17:30 +00:00
Robby Russell
12415a99d2 Merge pull request #2539 from chriswiggins/master 
Update battery plugin to show calculating - OSX
 2014-03-16 18:49:07 -07:00
Robby Russell
dcae31d071 Merge pull request #2549 from brandon-beacher/master 
Remove mailcatcher from the bundler plugin.
 2014-03-16 18:47:05 -07:00
Robby Russell
23a43e9fd6 Merge pull request #2574 from thiagowfx/linux-battery 
added the linux implementation to the battery plugin
 2014-03-16 18:46:50 -07:00
Robby Russell
080409a5a7 Merge pull request #2603 from docwhat/ssh-agent-hostname 
ssh-agent: prevent environment file from flapping
 2014-03-16 18:46:05 -07:00
Kevin Bongart
baeac5bec9 Remove copyright information, as per #2588 2014-03-16 16:52:37 -04:00
Andrew vonderLuft
bf4d4db72b Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev 2014-03-14 13:17:43 -07:00
Andrew vonderLuft
8f7971349b add option to show dirty status of current dir 2014-03-14 13:17:03 -07:00
Bob Williams
223fd60ba5 Merge remote-tracking branch 'upstream/master' 2014-03-14 10:32:03 -04:00
Michael Hauser-Raspe
9e90bf0f23 Added v as a keybinding to edit-command-line 
taken from [here](http://www.zsh.org/mla/users/2008/msg01013.html)
We want pressing v in command mode to take us to an editor (defined by the $VISUAL or $EDITOR variable or vi) to edit the current contents of the command line which (I believe) is a standard feature of bash vi-mode or other readline prompts (see [here](http://www.catonmat.net/download/bash-vi-editing-mode-cheat-sheet.pdf) and [here](http://www.catonmat.net/blog/bash-vi-editing-mode-cheat-sheet/) for source).
 2014-03-14 10:14:47 +00:00
Robby Russell
d752c8cbc1 Merge pull request #2584 from joukojo/master 
added mvn-update
 2014-03-13 16:14:37 -07:00
Robby Russell
3b604c6cd9 Merge pull request #2590 from zhouhua015/master 
Fix hgsl alias.
 2014-03-13 16:14:24 -07:00
Robby Russell
d058c9d3f7 Merge pull request #2593 from bobmaerten/typo-docker-plugin 
Typo in autocomplete arguments for docker plugin
 2014-03-13 16:13:20 -07:00
Christian Höltje
cfe468f6f6 ssh-agent: prevent environment file from flapping 
On an OS X laptop, the variable `$HOST` changes a lot depending
on what wifi network you're connected to.  This causes a lot
of `~/.ssh/environment-$HOST` files to be created and
causes multiple ssh-agents to created.

Instead, use `scutil --get ComputerName` to get something
more stable.
 2014-03-13 14:44:58 -04:00
Robby Russell
de78e47d27 Merge pull request #2149 from cristim/master 
Added a completion plugin for the new aws-cli tool
 2014-03-13 08:07:46 -07:00
Robby Russell
ca648ae7b1 Merge pull request #2072 from jorge-d/master 
Add autocompletion plugin for meteor command
 2014-03-13 08:06:42 -07:00
Robby Russell
d65a153593 Merge pull request #2595 from ksamdev/git.io 
Add github url shortener
 2014-03-13 08:05:44 -07:00
Robby Russell
d0dcedcde2 Merge pull request #2421 from LFDM/rails_plugin_fix 
Fixes _rails_command in new rails plugin
 2014-03-13 07:55:19 -07:00
Robby Russell
7c95518f80 Merge pull request #2518 from erawk/master 
Updated _brew zsh autocompletion to latest Homebrew upstream
 2014-03-13 07:44:01 -07:00
Robby Russell
e8b85f9202 Merge pull request #1776 from ronshapiro/master 
plugged_in function
 2014-03-13 07:41:18 -07:00
Robby Russell
a5df4d79c7 Merge pull request #1501 from gambhiro/master 
more lol
 2014-03-13 07:40:40 -07:00
Robby Russell
d8ed8f669a Merge pull request #650 from tristan0x/emacs 
Emacs
 2014-03-13 07:33:23 -07:00
Josh Chih-Hsueh Huang
ae2f6f34e3 List pkgs by size 2014-03-11 11:29:25 +08:00
Samvel Khalatyan
b9841b0bae Add github url shortener 2014-03-10 17:18:50 -05:00
Bob Maerten
3c9a29b0d6 Fix typo in autocomplete arguments 2014-03-10 16:23:14 +01:00
Zhou Hua
de0e7b5dc8 Fix hgsl alias. 
The original 'hgsl' missed 'hg' part.
 2014-03-10 11:41:25 +08:00
Robby Russell
a811ab0ba7 Merge pull request #2331 from posva/catimg 
Catimg plugin
 2014-03-08 08:42:01 -08:00
Robby Russell
59db638d99 Merge pull request #2565 from theallegedjosh/master 
ruby-gems aliases
 2014-03-08 08:34:50 -08:00
Robby Russell
7b7c5fd12b Merge pull request #2579 from mfaerevaag/master 
Updated wd plugin to v0.3.0
 2014-03-08 08:33:14 -08:00
Robby Russell
0018969b80 Merge pull request #2535 from IgorTimoshenko/feature/yii-plugin 
Added Yii basic command completion
 2014-03-08 08:32:37 -08:00
Robby Russell
01261d4795 Merge pull request #2556 from chrisjones-brack3t/fix/git-prompt-1-9 
git-prompt (gitstatus.py) plugin fix
 2014-03-08 08:23:16 -08:00
Robby Russell
0e10ebb9f6 Merge pull request #2572 from kevinxucs/sublime-linux-fix 
Fixed sublime plugin behaviors.
 2014-03-08 08:22:55 -08:00
Robby Russell
0e31bed555 Merge pull request #2059 from felipec/fc/gitfast 
gitfast: update to upstream v1.8.4
 2014-03-08 08:21:12 -08:00
Robby Russell
755f8094b8 Merge pull request #2529 from emanuelez/patch-1 
Improve oneline logs
 2014-03-08 08:16:34 -08:00
Robby Russell
95e6feaf76 Merge pull request #2525 from lukesteensen/update-go-plugin 
unify and update golang plugins
 2014-03-08 08:15:54 -08:00
Robby Russell
7b06ce70a6 Merge pull request #2366 from chuancong/patch-1 
pip: Add support to command "show"
 2014-03-08 08:14:16 -08:00
Robby Russell
cc926e9987 Merge pull request #2322 from dpsk/patch-2 
Add alias to rails plugin
 2014-03-08 08:13:48 -08:00
Robby Russell
92a54ebc7e Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root 
rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
 2014-03-08 08:13:19 -08:00
Robby Russell
978bb40d03 Merge pull request #2564 from miry/patch-3 
Added simulator alias for Xcode plugin
 2014-03-08 08:10:53 -08:00
Robby Russell
7a14ab7f38 Merge pull request #2400 from bric3/svn_fast_plugin 
new faster SVN plugin
 2014-03-08 08:08:47 -08:00
Jouko Johansson
fd8ce7f8e3 added mvnjetty alias 2014-03-07 01:23:37 +02:00
Jouko Johansson
7378765a79 added aliases for tomcat:run tomcat7:run 2014-03-07 01:22:37 +02:00
Jouko Johansson
8b667b2299 added mvn-update 2014-03-07 01:09:04 +02:00
Markus Faerevaag
d41ac7fe3e Updated wd plugin to v0.3.0 2014-03-04 20:25:54 +01:00
Jeff Williams
c0b98cd6ac Added dirhistory plugin. 
This plugin navigates directory history using ALT-LEFT and ALT-RIGHT.
 2014-03-03 10:18:10 -05:00
Kaiwen Xu
2691520d6f Integrate changes from #1841. 2014-03-02 14:13:55 -05:00