Merge branch 'master' of gitorious.org:shedskin/mainline
authorMark Dufour <mark.dufour@gmail.com>
Tue, 1 Nov 2011 15:31:09 +0000 (16:31 +0100)
committerMark Dufour <mark.dufour@gmail.com>
Tue, 1 Nov 2011 15:31:09 +0000 (16:31 +0100)
commit6b60fb0893daee3dd9d6955a7919e22ee4ee6745
tree7d1e4691acc8dbbaa0d632ddf9e7ce0c5e89c1a8
parent27568ddf45737ef358369e515ff29a4a98920ada
parent620cc4e17a58fff0acfe5c60b7c9e837f98dcb1e
Merge branch 'master' of gitorious.org:shedskin/mainline