merge 0.18.x branch into master
authorStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:15:39 +0000 (19:15 +0100)
committerStefan Behnel <stefan_ml@behnel.de>
Sat, 26 Jan 2013 18:15:39 +0000 (19:15 +0100)
commit8788d538d1f9c4cbaf483c42182eba663675f2fd
treed204312474bc58e13829aa53d1b9167e9a345314
parentad4fe691a6869232d0cf35d977f063056f4d5fc5
parent6eb0745f2a28cbf60bfbe4feb40f95ddb5b54c46
merge 0.18.x branch into master