Merge branch 'master' into apache
authorRafael Monnerat <rafael@nexedi.com>
Thu, 9 Jun 2011 15:26:41 +0000 (12:26 -0300)
committerRafael Monnerat <rafael@nexedi.com>
Thu, 9 Jun 2011 15:26:41 +0000 (12:26 -0300)
commitf146970786425f25159ecc426994e1c2752fd8b3
tree333abb96f5949f561554d9c46c8f89eaaf38018a
parent68000cff0fbb526edd29a3eecbcc89e1d01f11ae
parent28aa8f0bc7fd5034cd145c9da05aa7f450d8398c
Merge branch 'master' into apache
setup.py