Merge branch 'upstream' into mast3r
commitd11c4e4a8ee1906a4e7781ad2a2475008e3f58c8
authorPanagiotis Vossos <panagiotis@vossos.name>
Thu, 13 Jan 2011 16:16:27 +0000 (13 18:16 +0200)
committerPanagiotis Vossos <panagiotis@vossos.name>
Thu, 13 Jan 2011 16:16:27 +0000 (13 18:16 +0200)
tree75b56d02e470f8a12963b1c0e6ad9ab3002cad1f
parentbd07f957b2b2f4620d5d079f47500f458e0dd5f9
parent2f6e3047b1cb0324945ec0a6f601edecba7e4269
Merge branch 'upstream' into mast3r