Merge branch 'strategies'master
commit41ad740774a7747eee8fc71ca9a2e1305e84f6c2
authorzzandy <zzandy@gmail.com>
Thu, 25 Nov 2010 21:16:27 +0000 (25 23:16 +0200)
committerzzandy <zzandy@gmail.com>
Thu, 25 Nov 2010 21:16:27 +0000 (25 23:16 +0200)
tree795e79eba2d9c00ce32d8f0d586d7ec80a7645e5
parentd7ef3e6ac8cc452df9a88be09f3a07b37180bcfa
parent7ac0610438648be35c7b196b0e37a77bdaf71a68
Merge branch 'strategies'