tree b08a2ad0fad57131563aa8c071221bea241128c1
parent 277b7efe493887081ce1dafd91199d0ee9f676c9
parent e4c93a392763a006d11e1c1dd01c12f85498dad5
author Carlos Martín Nieto <carlos@cmartin.tk> 1321652756 +0100
committer Carlos Martín Nieto <carlos@cmartin.tk> 1321652756 +0100

Merge branch 'development' into error-handling

The code in this branch has been modified so it works with the global
state introduced in development.