Update mail for contributor in comments
Merge branch 'master' of https://github.com/alexprengere/liquidprompt into develop
fixing issue #132

forcing a certain value for IFS in _lp_load_color
implementing default prompt mark

as described in issue #135
updating documentation
Merge pull request #133 from jaesivsm/develop

fixing issue #132 — force the Internal Field Separator
Merge pull request #136 from jaesivsm/issue/135

Issue/135 — default prompt mark
Add an analog clock

Using `LP_TIME_ANALOG`, you can now display an analog clock instead of
numeric values. The analog clock is "accurate" to the nearest half hour.
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
Touch up spelling and grammar.
More grammar touchups.
Refined the intro and installation sections.

Hello,

I saw the liquidprompt on Hackernew. 
I tried to give it a more catching intro to focus on 
why a new user should use it and how it helps them save time. 

I also tried to state the install section more clearly. 
This way users can testdrive it quicker. 

Congrats on the Hackernews list. 
I hope you accept these changes.
Fixing an issue where logname might not return the right value, but
$LOGNAME does
Allow setting the color on the virtualenv display
Add enabling virtualenv option to the liquidpromptrc-dist
bugfix analog time with a correct and faster implementation
Merge branch 'master' of https://github.com/thanatos/liquidprompt into develop
Merge branch 'patch-1' of https://github.com/rvanlaar/liquidprompt into develop

Keep the new intro from rvanlaar
Conflicts:
	README.md
Merge branch 'logged-in-user-fix' of https://github.com/jab416171/liquidprompt into develop
Merge branch 'master' of https://github.com/cyli/liquidprompt into develop