Merge branch 'master' of gitorious.org:shedskin/mainline
authorMark Dufour <mark.dufour@gmail.com>
Thu, 30 Dec 2010 14:05:17 +0000 (15:05 +0100)
committerMark Dufour <mark.dufour@gmail.com>
Thu, 30 Dec 2010 14:05:17 +0000 (15:05 +0100)
commit82d70bfeb9f8974575682bdcb26a8304d7d43f14
tree43524fbb489c12b208dda3321777314b9ed3942e
parentf2999223e5b197252d7cf45c173af84a390f0446
parentaa727fed083d7990c6c419d6c3cffe4940020ed3
Merge branch 'master' of gitorious.org:shedskin/mainline