Merge branch 'stash-view'master
commit8b1646fbb3fd525f3cd0d90425181ac2eaa41756
authorGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Wed, 18 Jun 2008 19:40:56 +0000 (18 21:40 +0200)
committerGuilhem Bonnefille <guilhem.bonnefille@gmail.com>
Wed, 18 Jun 2008 19:40:56 +0000 (18 21:40 +0200)
tree832a5ec2082fdc8731d9447e2aa4b1b2bb2bde6c
parentbda30d22e5c0dee608dc51b78d42a98e35f2a570
parent923825781eae7615060d8f766b5019a7ba95b425
Merge branch 'stash-view'