Adding internet connection verification feature
solve a remaining merge conflict in the readme
Note about PROMPT_COMMAND
Display a yellow + if stashs

Add a yellow + after the git infos, if there is at least one stash.
The * in case of untracked file is now red.
Correction 'update_terminal_cwd error' on Mac OSX (Mountain) Lion systems
Adding internet connection verification feature
Adding Mac OSX support for battery information
Merge branch 'develop' of github.com:dloureiro/liquidprompt into internet_connection_status
Adding a first naive implementation of an internet connection status feature
reducing LP_IC_OK and LP_IC_NOK mark size
Removing stuff coming from conflicts
Merge branch 'develop' of github.com:dloureiro/liquidprompt into battery_status_osx
Resolving conflict
Conflicts:
	liquidprompt
Differents colors for differents hosts you SSH in

Adds the LP_ENABLE_SSH_COLORS option to use a numeric hash of the hostname as the displayed color.
Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature

Same problem as #107, same solution ;)
Merge pull request #112 from ldidry/107

Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature
git: Add support for detached head state
git: check the correct remote branch for has_commit

Previously it was always checking against origin/$branch, but the
remote branch can have any name and the remote branch can also have
any name.
Fix custom.ps1 sourcing
Merge branch 'fix-git-integration' of https://github.com/jonasb/liquidprompt into develop
Merge branch 'ps1' of https://github.com/ldidry/liquidprompt into develop
Merge branch 'master' into develop

Conflicts:
	liquidprompt