Merge branch 'master' into bindings/python
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 20 Jan 2013 17:57:42 +0000 (12:57 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Sun, 20 Jan 2013 17:57:42 +0000 (12:57 -0500)

Trivial merge
This page took 0.031348 seconds and 4 git commands to generate.