Merge remote branch 'limansky/dia-images'
commitd322c95faf7241ecb04b7115f86aabb2fe8d0e1f
authorScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:06:50 +0000 (2 10:06 -0800)
committerScott Chacon <schacon@gmail.com>
Wed, 2 Dec 2009 18:06:50 +0000 (2 10:06 -0800)
tree44b784ec401b6c77b64c283cf723cda300d3b844
parenta83c9256c1541e4302bcbaa37882540089c41cd1
parent1d58ac3f91db9270deaaa85b4d30d4c53a34a2ba
Merge remote branch 'limansky/dia-images'