Merge branch 'jc/stash-pop-not-popped' into maint

* jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply

Junio C Hamano committed Apr 3, 2014 at 13:39 UTC 6248be7678ad2c262a460c052ef4f28744e75cc4

No changes.