Merge branch 'v1.2'
commit0d3369b3ee0f1aaa1aeeab7b6e19a8cb66798029
authorHans Huebner <hans.huebner@gmail.com>
Tue, 13 Dec 2011 10:49:13 +0000 (13 05:49 -0500)
committerHans Huebner <hans.huebner@gmail.com>
Tue, 13 Dec 2011 10:49:13 +0000 (13 05:49 -0500)
tree9067b1b6c4c0a988f1cfb3e5352ea8346b281746
parent9c49433eddc077265d5ed8e19cb678fecd07dbeb
parent3b7fc7d2767a7d95589464d973a4ccefdba2487d
Merge branch 'v1.2'